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

[Laurent Léonard]

The following commit has been merged in the master branch:
commit d4cf606d5ba2c226db3bc9a99159cb6d4626c3b6
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Thu Jul 8 11:44:57 2010 +0200

    virt-install: Fix CDROM attach for windows installs

diff --git a/debian/patches/0004-virt-install-Fix-CDROM-attach-for-windows-installs.patch b/debian/patches/0004-virt-install-Fix-CDROM-attach-for-windows-installs.patch
new file mode 100644
index 0000000..e060067
--- /dev/null
+++ b/debian/patches/0004-virt-install-Fix-CDROM-attach-for-windows-installs.patch
@@ -0,0 +1,38 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Wed, 23 Jun 2010 11:34:16 -0400
+Subject: [PATCH] virt-install: Fix CDROM attach for windows installs
+
+We were unintentionally dropping the CDROM device for the 2nd stage of the
+install.
+
+Origin: upstream, http://hg.fedorahosted.org/hg/python-virtinst/rev/e5ab15cd4c24
+---
+ virtinst/Guest.py |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/virtinst/Guest.py b/virtinst/Guest.py
+index c6a19c9..f6bceea 100644
+--- a/virtinst/Guest.py
++++ b/virtinst/Guest.py
+@@ -758,6 +758,10 @@ class Guest(object):
+     ############################
+ 
+     def _prepare_install(self, meter):
++        # Empty install dev list
++        # Warning: moving this to cleanup_install breaks continue_install
++        self._install_devices = []
++
+         # Initialize install device list
+         self._install_devices = self.get_all_devices()[:]
+ 
+@@ -774,9 +778,6 @@ class Guest(object):
+         self._set_defaults(self._get_install_devs)
+ 
+     def _cleanup_install(self):
+-        # Empty install dev list
+-        self._install_devices = []
+-
+         self._installer.cleanup()
+ 
+     def _create_devices(self, progresscb):
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 3419750..83753c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-fix-path-to-hvmloader.patch
 0002-Fix-path-to-pygrub.patch
 0003-Fix-path-to-keyboard-configuration.patch
+0004-virt-install-Fix-CDROM-attach-for-windows-installs.patch

-- 
Virtinst Debian packaging