[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.600.3-2

[Guido Günther]

The following commit has been merged in the master branch:
commit ae618e484697a21450699e1bdc2578214d203b9d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Oct 11 19:02:44 2012 +0200

    Don't overwrite target element for disks that have it already set

diff --git a/debian/patches/0005-Don-t-overwrite-target-element-for-disks-that-have-i.patch b/debian/patches/0005-Don-t-overwrite-target-element-for-disks-that-have-i.patch
new file mode 100644
index 0000000..b89cb8e
--- /dev/null
+++ b/debian/patches/0005-Don-t-overwrite-target-element-for-disks-that-have-i.patch
@@ -0,0 +1,68 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 19 Sep 2012 20:56:34 +0200
+Subject: Don't overwrite target element for disks that have it already set
+
+This makes the usage consistent with the bus element just above and
+allows to setup the target device before adding it to the Installer.
+---
+ tests/cli-test-xml/compare/image-boot0.xml       |    2 +-
+ tests/cli-test-xml/compare/image-nogfx.xml       |    2 +-
+ tests/image-xml/image2guest/image-format-out.xml |    2 +-
+ virtinst/Guest.py                                |    5 ++++-
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/tests/cli-test-xml/compare/image-boot0.xml b/tests/cli-test-xml/compare/image-boot0.xml
+index 0c9b426..ac4ce01 100644
+--- a/tests/cli-test-xml/compare/image-boot0.xml
++++ b/tests/cli-test-xml/compare/image-boot0.xml
+@@ -18,7 +18,7 @@
+     </disk>
+     <disk type='file' device='disk'>
+       <source file='/tmp/__virtinst__cli_scratch.raw'/>
+-      <target dev='xvdb' bus='xen'/>
++      <target dev='xvdc' bus='xen'/>
+     </disk>
+     <interface type='user'>
+       <mac address='00:11:22:33:44:55'/>
+diff --git a/tests/cli-test-xml/compare/image-nogfx.xml b/tests/cli-test-xml/compare/image-nogfx.xml
+index a7efb38..6f63242 100644
+--- a/tests/cli-test-xml/compare/image-nogfx.xml
++++ b/tests/cli-test-xml/compare/image-nogfx.xml
+@@ -18,7 +18,7 @@
+     </disk>
+     <disk type='file' device='disk'>
+       <source file='/tmp/__virtinst__cli_scratch.raw'/>
+-      <target dev='xvdb' bus='xen'/>
++      <target dev='xvdc' bus='xen'/>
+     </disk>
+     <interface type='user'>
+       <mac address='00:11:22:33:44:55'/>
+diff --git a/tests/image-xml/image2guest/image-format-out.xml b/tests/image-xml/image2guest/image-format-out.xml
+index 396bbc4..16bc30c 100644
+--- a/tests/image-xml/image2guest/image-format-out.xml
++++ b/tests/image-xml/image2guest/image-format-out.xml
+@@ -30,7 +30,7 @@
+     <disk type='file' device='disk'>
+       <driver name='qemu' type='vmdk'/>
+       <source file='REPLACEME/tests/image-xml/image-format.xml'/>
+-      <target dev='hdd' bus='ide'/>
++      <target dev='hdc' bus='ide'/>
+     </disk>
+     <input type='mouse' bus='ps2'/>
+     <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+diff --git a/virtinst/Guest.py b/virtinst/Guest.py
+index 23b4946..1ff2db2 100644
+--- a/virtinst/Guest.py
++++ b/virtinst/Guest.py
+@@ -1510,7 +1510,10 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain):
+                             disk.bus = "ide"
+                     elif self.installer.is_xenpv():
+                         disk.bus = "xen"
+-            used_targets.append(disk.generate_target(used_targets))
++            if disk.target:
++                used_targets.append(disk.target)
++            else:
++                used_targets.append(disk.generate_target(used_targets))
+ 
+         # Set sound device model
+         sound_model  = self._lookup_device_param(soundtype, "model")
diff --git a/debian/patches/series b/debian/patches/series
index 7d0cd50..42fba28 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-LogicalPool-properly-pass-on-autostart-flag.patch
+0005-Don-t-overwrite-target-element-for-disks-that-have-i.patch

-- 
Virtinst Debian packaging