[virt-manager/f20] addhardware: Fix adding disk through 'customize' dialog (bz #1073808)

[Cole Robinson]

commit 88f86f622b24184368d5a0cb686fbdd0b5527909
Author: Cole Robinson <crobinso at redhat.com>
Date:   Fri Mar 7 09:53:48 2014 -0500

    addhardware: Fix adding disk through 'customize' dialog (bz #1073808)

 ...-Fix-adding-disk-through-customize-dialog.patch |   32 ++++++++++++++++++++
 virt-manager.spec                                  |    9 +++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/0017-addhardware-Fix-adding-disk-through-customize-dialog.patch b/0017-addhardware-Fix-adding-disk-through-customize-dialog.patch
new file mode 100644
index 0000000..57167ba
--- /dev/null
+++ b/0017-addhardware-Fix-adding-disk-through-customize-dialog.patch
@@ -0,0 +1,32 @@
+From d07fba2758c57897c3cb2e39681894090534f04f Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Fri, 7 Mar 2014 09:37:08 -0500
+Subject: [PATCH] addhardware: Fix adding disk through 'customize' dialog (bz
+ 1073808)
+
+(cherry picked from commit 7ef9d7fbfc4173b6a6e88b6fb74e895293ffda55)
+---
+ virtManager/addhardware.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py
+index b1f6251..aba6f89 100644
+--- a/virtManager/addhardware.py
++++ b/virtManager/addhardware.py
+@@ -1477,13 +1477,15 @@ class vmmAddHardware(vmmGObjectUI):
+                 disk.driver_cache = cache
+ 
+             # Generate target
++            disks = []
+             if not self.is_customize_dialog:
+                 disks = (self.vm.get_disk_devices() +
+                          self.vm.get_disk_devices(inactive=True))
+                 for d in disks:
+                     used.append(d.target)
+ 
+-            prefer_ctrl = self._set_disk_controller(disk, controller_model, disks)
++            prefer_ctrl = self._set_disk_controller(
++                disk, controller_model, disks)
+ 
+             if not self.is_customize_dialog:
+                 disk.generate_target(used, prefer_ctrl)
diff --git a/virt-manager.spec b/virt-manager.spec
index 11bb61a..a8b04cb 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -20,7 +20,7 @@
 
 
 %define _version 1.0.0
-%define _release 4
+%define _release 5
 
 
 # This macro is used for the continuous automated builds. It just
@@ -68,6 +68,8 @@ Patch0013: 0013-virt-install-Fix-location-iso-again-and-test-it-bz-1.patch
 Patch0014: 0014-Handle-libvirt-generating-invalid-volume-XML-bz-1072.patch
 Patch0015: 0015-xmlbuilder-Log-broken-XML-if-we-can-t-parse-it.patch
 Patch0016: 0016-xmlbuilder-Actually-import-logging.patch
+# addhardware: Fix adding disk through 'customize' dialog (bz #1073808)
+Patch0017: 0017-addhardware-Fix-adding-disk-through-customize-dialog.patch
 BuildArch: noarch
 
 
@@ -162,6 +164,8 @@ machine).
 %patch0014 -p1
 %patch0015 -p1
 %patch0016 -p1
+# addhardware: Fix adding disk through 'customize' dialog (bz #1073808)
+%patch0017 -p1
 
 %build
 %if %{qemu_user}
@@ -271,6 +275,9 @@ fi
 
 
 %changelog
+* Fri Mar 07 2014 Cole Robinson <crobinso at redhat.com> - 1.0.0-5
+- addhardware: Fix adding disk through 'customize' dialog (bz #1073808)
+
 * Thu Mar 06 2014 Cole Robinson <crobinso at redhat.com> - 1.0.0-4
 - virt-convert: better error if unar is not installed
 - details: Fix fallback if fetching CPU models fails (bz #1072704)