rpms/python-virtinst/devel virtinst-0.500.3-fix-windows-cdrom.patch, NONE, 1.1 virtinst-0.500.3-poolsource-check.patch, NONE, 1.1 python-virtinst.spec, 1.80, 1.81

[Cole Robinson]

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4253

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.500.3-fix-windows-cdrom.patch 
	virtinst-0.500.3-poolsource-check.patch 
Log Message:
Keep windows CDROM attached for second install stage
Fix pool source listing in virt-manager


virtinst-0.500.3-fix-windows-cdrom.patch:
 Guest.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE virtinst-0.500.3-fix-windows-cdrom.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1277307256 14400
# Node ID e5ab15cd4c243f9ac2e7bcad77970dbe1c74cb81
# Parent  1ade3d1eaa72f8b6a097ac79e1fe7b5e66cedbf0
virt-install: Fix CDROM attach for windows installs

We were unintentionally dropping the CDROM device for the 2nd stage of the
install.

diff -r 1ade3d1eaa72 -r e5ab15cd4c24 virtinst/Guest.py
--- a/virtinst/Guest.py	Mon Jun 21 11:46:13 2010 -0400
+++ b/virtinst/Guest.py	Wed Jun 23 11:34:16 2010 -0400
@@ -822,6 +822,10 @@
     ############################
 
     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()[:]
 
@@ -838,9 +842,6 @@
         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):

virtinst-0.500.3-poolsource-check.patch:
 support.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virtinst-0.500.3-poolsource-check.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1276536501 14400
# Node ID 7870801299a53c6fc8e2d24c30069b66e7dc108e
# Parent  6e5b269b5611f20d7b42d910f17162a97e36aaaf
support: Fix check for findStoragePoolSources

diff -r 6e5b269b5611 -r 7870801299a5 virtinst/support.py
--- a/virtinst/support.py	Wed Jun 09 11:53:57 2010 -0400
+++ b/virtinst/support.py	Mon Jun 14 13:28:21 2010 -0400
@@ -97,7 +97,7 @@
     },
 
     SUPPORT_CONN_FINDPOOLSOURCES : {
-        "function" : "virConnect.findPoolSources",
+        "function" : "virConnect.findStoragePoolSources",
     },
 
     SUPPORT_CONN_KEYMAP_AUTODETECT : {


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- python-virtinst.spec	24 Mar 2010 23:47:03 -0000	1.80
+++ python-virtinst.spec	7 Jul 2010 20:46:55 -0000	1.81
@@ -17,10 +17,14 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.3
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 # Enable x2apic for new KVM guests
 Patch1: %{appname}-%{version}-use-x2apic.patch
+# Keep windows CDROM attached for second install stage
+Patch2: %{appname}-%{version}-fix-windows-cdrom.patch
+# Fix pool source listing in virt-manager
+Patch3: %{appname}-%{version}-poolsource-check.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -49,6 +53,8 @@ and install new VMs) and virt-clone (clo
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 python setup.py build
@@ -84,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Wed Jul 07 2010 Cole Robinson <crobinso at redhat.com> - 0.500.3-2.fc14
+- Keep windows CDROM attached for second install stage
+- Fix pool source listing in virt-manager
+
 * Wed Mar 24 2010 Cole Robinson <crobinso at redhat.com> - 0.500.2-3.fc14
 - Update to version 0.500.3
 - virt-install: New --watchdog option: configure a virtual watchdog device