[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, debian/wheezy, updated. debian/0.600.1-2-5-gf75e939

[Guido Günther]

The following commit has been merged in the debian/wheezy branch:
commit 4a6b19eb99194cdbbfafe3c8587b3cfd2a91ca55
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Jul 15 21:14:20 2013 +0200

    virt-clone: Properly set image type
    
    Thanks: Roy Meulekamp for sorting this out
    Closes: #716672

diff --git a/debian/patches/0006-virt-clone-Properly-set-image-type.patch b/debian/patches/0006-virt-clone-Properly-set-image-type.patch
new file mode 100644
index 0000000..925cfb7
--- /dev/null
+++ b/debian/patches/0006-virt-clone-Properly-set-image-type.patch
@@ -0,0 +1,51 @@
+From: Roy Meulekamp <debian.bugs at slimdesign.nl>
+Date: Mon, 15 Jul 2013 21:12:32 +0200
+Subject: virt-clone: Properly set image type
+
+Patch adapted from
+
+https://git.fedorahosted.org/cgit/python-virtinst.git/commit/?id=f0195e95d57deda83daed5231582ca86bde519ae
+https://git.fedorahosted.org/cgit/python-virtinst.git/commit/?id=8447cee94b36da389a73d3d81ecbbbe543ac5d8a
+---
+ virtinst/CloneManager.py | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/virtinst/CloneManager.py b/virtinst/CloneManager.py
+index c3ecdc2..e4c2efa 100644
+--- a/virtinst/CloneManager.py
++++ b/virtinst/CloneManager.py
+@@ -477,11 +477,6 @@ class CloneDesign(object):
+                     _("Clone onto existing storage volume is not "
+                       "supported: '%s'") % clone_disk.path)
+ 
+-            # Change the XML
+-            xmldisk.path = None
+-            xmldisk.type = clone_disk.type
+-            xmldisk.path = clone_disk.path
+-
+             # Sync 'size' between the two
+             if orig_disk.size:
+                 clone_disk.size = orig_disk.size
+@@ -504,6 +499,12 @@ class CloneDesign(object):
+             elif not self.preserve_dest_disks:
+                 clone_disk.clone_path = orig_disk.path
+ 
++            # Change the XML
++            xmldisk.path = None
++            xmldisk.type = clone_disk.type
++            xmldisk.path = clone_disk.path
++            xmldisk.driver_type = orig_disk.driver_type
++
+         # Save altered clone xml
+         self._clone_xml = self._guest.get_xml_config()
+ 
+@@ -556,7 +557,8 @@ class CloneDesign(object):
+                     device = VirtualDisk.DEVICE_CDROM
+ 
+                 d = VirtualDisk(disk.path, conn=self._hyper_conn,
+-                                device=device, validate=validate)
++                                device=device, driverType=disk.driver_type,
++                                validate=validate)
+                 d.target = disk.target
+             except Exception, e:
+                 logging.debug("", exc_info=True)
diff --git a/debian/patches/series b/debian/patches/series
index 61213f4..93f1a19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Fix-path-to-keyboard-configuration.patch
 0004-Fix-location-of-Debian-daily-builds.patch
 0005-Don-t-fail-if-we-can-t-set-locale-debian-bug-697864.patch
+0006-virt-clone-Properly-set-image-type.patch

-- 
Virtinst Debian packaging