[python-virtinst/f17] Fix 'customize before install' disk page (bz #978264)

[Cole Robinson]

commit f20a1c64771387f4fb911ffd2bd93024625a9b12
Author: Cole Robinson <crobinso at redhat.com>
Date:   Fri Jun 28 20:48:29 2013 -0400

    Fix 'customize before install' disk page (bz #978264)

 ...ng-disk-page-in-virt-manager-customize-be.patch |   72 ++++++++++++++++++++
 python-virtinst.spec                               |   11 +++-
 2 files changed, 82 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-accessing-disk-page-in-virt-manager-customize-be.patch b/0001-Fix-accessing-disk-page-in-virt-manager-customize-be.patch
new file mode 100644
index 0000000..fcdeb96
--- /dev/null
+++ b/0001-Fix-accessing-disk-page-in-virt-manager-customize-be.patch
@@ -0,0 +1,72 @@
+From 21858615b509f04ba0702e2f69f89225c322eb8c Mon Sep 17 00:00:00 2001
+Message-Id: <21858615b509f04ba0702e2f69f89225c322eb8c.1372466601.git.crobinso at redhat.com>
+From: Cole Robinson <crobinso at redhat.com>
+Date: Sat, 20 Apr 2013 18:37:34 -0400
+Subject: [PATCH] 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 "
+-- 
+1.8.2.1
+
diff --git a/python-virtinst.spec b/python-virtinst.spec
index 652d8d4..0a6b8af 100644
--- a/python-virtinst.spec
+++ b/python-virtinst.spec
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 
 %define _version 0.600.4
-%define _release 1
+%define _release 2
 
 %define with_rhel6_defaults 0
 %define with_selinux 1
@@ -33,6 +33,9 @@ Version: %{_version}
 Release: %{_release}%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 
+# Fix 'customize before install' disk page (bz #978264)
+Patch0001: 0001-Fix-accessing-disk-page-in-virt-manager-customize-be.patch
+
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +63,9 @@ and install new VMs) and virt-clone (clone an existing virtual machine).
 %prep
 %setup -q -n %{appname}-%{version}
 
+# Fix 'customize before install' disk page (bz #978264)
+%patch0001 -p1
+
 %build
 %if %{with_rhel6_defaults}
 %define _rhel6_defaults --rhel6defaults
@@ -96,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Fri Jun 28 2013 Cole Robinson <crobinso at redhat.com> - 0.600.4-2
+- Fix 'customize before install' disk page (bz #978264)
+
 * Mon Apr 01 2013 Cole Robinson <crobinso at redhat.com> - 0.600.4-1
 - Rebased to version 0.600.4
 - virt-install: New convenience option --controller usb2