[Pkg-libvirt-commits] [virtinst] 01/02: Fix accessing disk page in virt-manager 'customize before install'

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/0.600.4-3
in repository virtinst.

commit f382b1ea3551770788b1b58fce2f903d954de5bf
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jan 28 13:25:40 2014 +0100

    Fix accessing disk page in virt-manager 'customize before install'
    
    Thanks: Cole Robinson
    Closes: #735198
---
 ...ng-disk-page-in-virt-manager-customize-be.patch | 66 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 67 insertions(+)

diff --git a/debian/patches/0005-Fix-accessing-disk-page-in-virt-manager-customize-be.patch b/debian/patches/0005-Fix-accessing-disk-page-in-virt-manager-customize-be.patch
new file mode 100644
index 0000000..6deb52a
--- /dev/null
+++ b/debian/patches/0005-Fix-accessing-disk-page-in-virt-manager-customize-be.patch
@@ -0,0 +1,66 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Sat, 20 Apr 2013 18:37:34 -0400
+Subject: Fix accessing disk page in virt-manager 'customize before install'
+
+---
+ virtinst/VirtualDisk.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/virtinst/VirtualDisk.py b/virtinst/VirtualDisk.py
+index 3f9bcba..214a978 100644
+--- a/virtinst/VirtualDisk.py
++++ b/virtinst/VirtualDisk.py
+@@ -909,7 +909,7 @@ class VirtualDisk(VirtualDevice):
+                            xpath="./serial")
+     
+     def _get_iotune_read_bytes_sec(self):
+-        return self._iotune_read_bytes_sec
++        return self._iotune_read_bytes_sec or 0
+     def _set_iotune_read_bytes_sec(self, val):
+         if (type(val) is not type(1) or val < 0):
+             raise ValueError(_("IOTune read bytes per second value must be an "
+@@ -922,7 +922,7 @@ class VirtualDisk(VirtualDevice):
+                                           set_converter=lambda s, x: int(x))
+     
+     def _get_iotune_read_iops_sec(self):
+-        return self._iotune_read_iops_sec
++        return self._iotune_read_iops_sec or 0
+     def _set_iotune_read_iops_sec(self, val):
+         if (type(val) is not type(1) or val < 0):
+             raise ValueError(_("IOTune read iops per second value must be an "
+@@ -935,7 +935,7 @@ class VirtualDisk(VirtualDevice):
+                                          set_converter=lambda s, x: int(x))
+     
+     def _get_iotune_total_bytes_sec(self):
+-        return self._iotune_total_bytes_sec
++        return self._iotune_total_bytes_sec or 0
+     def _set_iotune_total_bytes_sec(self, val):
+         if (type(val) is not type(1) or val < 0):
+             raise ValueError(_("IOTune total bytes per second value must be an "
+@@ -948,7 +948,7 @@ class VirtualDisk(VirtualDevice):
+                                            set_converter=lambda s, x: int(x))
+     
+     def _get_iotune_total_iops_sec(self):
+-        return self._iotune_total_iops_sec
++        return self._iotune_total_iops_sec or 0
+     def _set_iotune_total_iops_sec(self, val):
+         if (type(val) is not type(1) or val < 0):
+             raise ValueError(_("IOTune total iops per second value must be an "
+@@ -961,7 +961,7 @@ class VirtualDisk(VirtualDevice):
+                                           set_converter=lambda s, x: int(x))
+     
+     def _get_iotune_write_bytes_sec(self):
+-        return self._iotune_write_bytes_sec
++        return self._iotune_write_bytes_sec or 0
+     def _set_iotune_write_bytes_sec(self, val):
+         if (type(val) is not type(1) or val < 0):
+             raise ValueError(_("IOTune write bytes per second value must be an "
+@@ -974,7 +974,7 @@ class VirtualDisk(VirtualDevice):
+                                            set_converter=lambda s, x: int(x))
+     
+     def _get_iotune_write_iops_sec(self):
+-        return self._iotune_write_iops_sec
++        return self._iotune_write_iops_sec or 0
+     def _set_iotune_write_iops_sec(self, val):
+         if (type(val) is not type(1) or val < 0):
+             raise ValueError(_("IOTune write iops per second value must be an "
diff --git a/debian/patches/series b/debian/patches/series
index 62d3f5b..0647ca9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fix-path-to-pygrub.patch
 0003-Fix-path-to-keyboard-configuration.patch
 0004-Don-t-fail-if-no-meter-is-used.patch
+0005-Fix-accessing-disk-page-in-virt-manager-customize-be.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/virtinst.git