diff --git a/python-virtinst.spec b/python-virtinst.spec index 1876d26..56a4c4d 100644 --- a/python-virtinst.spec +++ b/python-virtinst.spec @@ -17,10 +17,14 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.500.1 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz # Fix interface API detection for libvirt < 0.7.4 Patch1: %{appname}-%{version}-fix-interface-detect.patch +# virt-install: Fix --disk with --prompt (bz 560579) +Patch2: %{appname}-%{version}-fix-disk-prompt.patch +# Improve clone progress reporting (bz 550870) +Patch3: %{appname}-%{version}-improve-clone-progress.patch License: GPLv2+ Group: Development/Libraries @@ -49,6 +53,8 @@ and install new VMs) and virt-clone (clone an existing virtual machine). %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 +* Sun Mar 21 2010 Cole Robinson - 0.500.1-3.fc12 +- virt-install: Fix --disk with --prompt (bz 560579) +- Improve clone progress reporting (bz 550870) + * Wed Dec 09 2009 Cole Robinson - 0.500.1-2.fc12 - Fix interface API detection for libvirt < 0.7.4 diff --git a/virtinst-0.500.1-fix-disk-prompt.patch b/virtinst-0.500.1-fix-disk-prompt.patch new file mode 100644 index 0000000..3c52ec8 --- /dev/null +++ b/virtinst-0.500.1-fix-disk-prompt.patch @@ -0,0 +1,41 @@ +# HG changeset patch +# User Cole Robinson +# Date 1260461104 18000 +# Node ID dcabeb876e3939082288efbed35ceb9f4e5d7b0b +# Parent 645bde011e4965740f23e8bfbb15053b36541686 +virt-install: Fix --prompt if --disk also specified + +diff -r 645bde011e49 -r dcabeb876e39 virt-install +--- a/virt-install Thu Dec 10 10:45:41 2009 -0500 ++++ b/virt-install Thu Dec 10 11:05:04 2009 -0500 +@@ -269,13 +269,6 @@ + + def get_disk(disk, size, sparse, guest, conn, is_file_path): + +- # If user specified --disk, disable prompting for the whole validation +- # process, since falling back to prompting likely wouldn't provide +- # sufficient options. +- orig_prompt = cli.doprompt +- if not is_file_path: +- cli.set_prompt(False) +- + try: + if is_file_path: + kwargs = { 'conn': conn, 'path': disk, 'size': size, +@@ -290,7 +283,6 @@ + fail(_("Error with storage parameters: %s" % str(e))) + + guest.disks.append(d) +- cli.set_prompt(orig_prompt) + + def get_disks(file_paths, disk_paths, size, sparse, nodisks, guest, conn): + if nodisks: +@@ -303,7 +295,7 @@ + elif not file_paths and not disk_paths and not cli.is_prompt(): + fail(_("A disk must be specified (use --nodisks to override)")) + +- is_file_path = ((file_paths or cli.is_prompt()) or False) ++ is_file_path = (file_paths or (not disk_paths and cli.is_prompt())) + disk = (file_paths or disk_paths) + + # ensure we have equal length lists diff --git a/virtinst-0.500.1-improve-clone-progress.patch b/virtinst-0.500.1-improve-clone-progress.patch new file mode 100644 index 0000000..1ee9e1a --- /dev/null +++ b/virtinst-0.500.1-improve-clone-progress.patch @@ -0,0 +1,28 @@ +# HG changeset patch +# User Cole Robinson +# 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