From 37a71a40d3f8c82e84786f9148fef9352b66b98f Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@fedoraproject.org>
Date: Mar 22 2010 00:49:15 +0000
Subject: Improve clone progress reporting (bz 550870) virt-install: Fix windows

    installs

---

diff --git a/python-virtinst.spec b/python-virtinst.spec
index 3f90ae0..495fb44 100644
--- a/python-virtinst.spec
+++ b/python-virtinst.spec
@@ -17,8 +17,12 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.2
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
+# Improve clone progress reporting (bz 550870)
+Patch1: %{appname}-%{version}-improve-clone-progress.patch
+# virt-install: Fix windows installs
+Patch2: %{appname}-%{version}-fix-windows-installs.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -46,6 +50,8 @@ and install new VMs) and virt-clone (clone an existing virtual machine).
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
+%patch2 -p1
 
 %build
 python setup.py build
@@ -81,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Sun Mar 21 2010 Cole Robinson <crobinso@redhat.com> - 0.500.2-2.fc14
+- Improve clone progress reporting (bz 550870)
+- virt-install: Fix windows installs
+
 * Mon Feb  8 2010 Cole Robinson <crobinso@redhat.com> - 0.500.2-1.fc13
 - Update to version 0.500.2
 - virt-install --autostart option for setting domain autostart flag
diff --git a/virtinst-0.500.2-fix-windows-installs.patch b/virtinst-0.500.2-fix-windows-installs.patch
new file mode 100644
index 0000000..d494f0e
--- /dev/null
+++ b/virtinst-0.500.2-fix-windows-installs.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1269010523 14400
+# Node ID 241a387c9bc7cfb0144cdbf94db824372896c505
+# Parent  1206822d2ef332c57cde10bce5010c3028be7bb1
+Fix windows installs, add a test to prevent regression
+
+diff -r 1206822d2ef3 -r 241a387c9bc7 virtinst/Guest.py
+--- a/virtinst/Guest.py	Wed Mar 17 12:01:32 2010 -0400
++++ b/virtinst/Guest.py	Fri Mar 19 10:55:23 2010 -0400
+@@ -797,6 +797,9 @@
+         @type disk_boot: C{bool}
+         """
+ 
++        # Set device defaults so we can validly generate XML
++        self._set_defaults(self.get_devices)
++
+         if install:
+             action = "destroy"
+         else:
diff --git a/virtinst-0.500.2-improve-clone-progress.patch b/virtinst-0.500.2-improve-clone-progress.patch
new file mode 100644
index 0000000..1ee9e1a
--- /dev/null
+++ b/virtinst-0.500.2-improve-clone-progress.patch
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1267236785 18000
+# Node ID cb28868d921336410bd70d47da74e4c064a6311a
+# Parent  aaa7c90ac60063f1b717b53db6739851396f2d60
+clone: Show storage progress capped at capacity, rather than allocation.
+
+diff -r aaa7c90ac600 -r cb28868d9213 virtinst/Storage.py
+--- a/virtinst/Storage.py	Fri Feb 26 18:43:49 2010 -0500
++++ b/virtinst/Storage.py	Fri Feb 26 21:13:05 2010 -0500
+@@ -1146,7 +1146,7 @@
+                 self._install_finished = False
+                 t.start()
+                 if meter:
+-                    meter.start(size=self.allocation,
++                    meter.start(size=self.capacity,
+                                 text=_("Allocating '%s'") % self.name)
+ 
+                 if self.input_vol:
+@@ -1155,7 +1155,7 @@
+                     vol = self.pool.createXML(xml, 0)
+ 
+                 if meter:
+-                    meter.end(self.allocation)
++                    meter.end(self.capacity)
+                 logging.debug("Storage volume '%s' install complete." %
+                               self.name)
+                 return vol