diff --git a/virt-manager-0.8.3-fix-open-conn.patch b/virt-manager-0.8.3-fix-open-conn.patch new file mode 100644 index 0000000..5de09e3 --- /dev/null +++ b/virt-manager-0.8.3-fix-open-conn.patch @@ -0,0 +1,66 @@ +# HG changeset patch +# User Cole Robinson +# Date 1269442662 14400 +# Node ID f7d7a91070504287678514abe645fa7227bb963f +# Parent 3ae371c1a9fb4c233f10870e1d1508ef7b951137 +Fix 'Open Connection' dialog + +diff -r 3ae371c1a9fb -r f7d7a9107050 src/virtManager/engine.py +--- a/src/virtManager/engine.py Wed Mar 24 10:54:38 2010 -0400 ++++ b/src/virtManager/engine.py Wed Mar 24 10:57:42 2010 -0400 +@@ -341,9 +341,9 @@ + self.windowConnect = None + + try: +- try: +- conn = self._lookup_connection(uri) +- except Exception: ++ conn = self._check_connection(uri) ++ if not conn: ++ # Unknown connection, add it + conn = self.add_connection(uri, readOnly, autoconnect) + + self.show_manager() +@@ -351,6 +351,7 @@ + conn.open() + return conn + except Exception: ++ logging.exception("Error connecting to %s" % uri) + return None + + def _connect_cancelled(self, connect): +@@ -513,9 +514,12 @@ + self.connections[uri]["windowHost"].show() + + def show_connect(self): ++ def connect_wrap(src, *args): ++ return self.connect_to_uri(*args) ++ + if self.windowConnect == None: + self.windowConnect = vmmConnect(self.get_config(), self) +- self.windowConnect.connect("completed", self.connect_to_uri) ++ self.windowConnect.connect("completed", connect_wrap) + self.windowConnect.connect("cancelled", self._connect_cancelled) + self.windowConnect.show() + +@@ -680,12 +684,17 @@ + + return handle_id + ++ def _check_connection(self, uri): ++ conn = self.connections.get(uri) ++ if conn: ++ return conn["connection"] ++ return None ++ + def _lookup_connection(self, uri): +- conn = self.connections.get(uri) ++ conn = self._check_connection(uri) + if not conn: + raise RuntimeError(_("Unknown connection URI %s") % uri) +- +- return conn["connection"] ++ return conn + + def save_domain(self, src, uri, uuid): + conn = self._lookup_connection(uri) diff --git a/virt-manager-0.8.3-fix-pkit-deadlock.patch b/virt-manager-0.8.3-fix-pkit-deadlock.patch new file mode 100644 index 0000000..10b4549 --- /dev/null +++ b/virt-manager-0.8.3-fix-pkit-deadlock.patch @@ -0,0 +1,12 @@ +diff -rup old/src/virtManager/manager.py virt-manager-0.8.3/src/virtManager/manager.py +--- old/src/virtManager/manager.py 2010-04-14 13:01:23.776680000 -0400 ++++ virt-manager-0.8.3/src/virtManager/manager.py 2010-04-14 13:02:45.615300000 -0400 +@@ -211,7 +211,7 @@ class vmmManager(gobject.GObject): + vmlist.get_model().get_iter_first()) + + # Queue up the default connection detector +- gobject.idle_add(self.engine.add_default_connection) ++ util.safe_idle_add(self.engine.add_default_connection) + + ################## + # Common methods # diff --git a/virt-manager-0.8.3-fix-vol-finish.patch b/virt-manager-0.8.3-fix-vol-finish.patch new file mode 100644 index 0000000..6c21d8d --- /dev/null +++ b/virt-manager-0.8.3-fix-vol-finish.patch @@ -0,0 +1,45 @@ +# HG changeset patch +# User Cole Robinson +# Date 1266846561 18000 +# Node ID 1eea5c799a3259099963d49980794d381a6b4d33 +# Parent f7f39e05fafc254b55110c9668df00e034e9305b +createvol: Sensitize 'Finish' if default name suggested + +diff -r f7f39e05fafc -r 1eea5c799a32 src/virtManager/createvol.py +--- a/src/virtManager/createvol.py Sun Feb 21 18:40:45 2010 +0000 ++++ b/src/virtManager/createvol.py Mon Feb 22 08:49:21 2010 -0500 +@@ -113,12 +113,16 @@ + return "" + + suffix = self.default_suffix() ++ ret = "" + try: +- return Storage.StorageVolume.find_free_name(self.name_hint, ++ ret = Storage.StorageVolume.find_free_name(self.name_hint, + pool_object=self.parent_pool.pool, + suffix=suffix) ++ ret = ret.rstrip(suffix) + except: +- return "" ++ pass ++ ++ return ret + + def default_suffix(self): + suffix = "" +@@ -127,9 +131,13 @@ + return suffix + + def reset_state(self): +- self.window.get_widget("vol-name").set_text(self.default_vol_name()) ++ default_name = self.default_vol_name() ++ self.window.get_widget("vol-name").set_text("") ++ self.window.get_widget("vol-create").set_sensitive(False) ++ if default_name: ++ self.window.get_widget("vol-name").set_text(default_name) ++ + self.window.get_widget("vol-name").grab_focus() +- self.window.get_widget("vol-create").set_sensitive(False) + self.populate_vol_format() + self.populate_vol_suffix() + diff --git a/virt-manager.spec b/virt-manager.spec index a01fe13..c97a7c9 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -8,7 +8,7 @@ Name: virt-manager Version: 0.8.3 -Release: 2%{_extra_release} +Release: 3%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -29,6 +29,12 @@ Patch4: %{name}-%{version}-check-packagekit.patch Patch5: %{name}-%{version}-fake-reboot.patch # Mark some strings as translatable (bz 572645) Patch6: %{name}-%{version}-mark-translatable-strings.patch +# Fix volume creation from 'New VM' wizard (bz 579039) +Patch7: %{name}-%{version}-fix-vol-finish.patch +# Fix firstrun app lock up when calling PackageKit +Patch8: %{name}-%{version}-fix-pkit-deadlock.patch +# Fix File->Add Connection (bz 580578) +Patch9: %{name}-%{version}-fix-open-conn.patch # These two are just the oldest version tested Requires: pygtk2 >= 1.99.12-6 @@ -93,6 +99,9 @@ management API. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build %configure @@ -166,6 +175,11 @@ fi %{_datadir}/dbus-1/services/%{name}.service %changelog +* Wed Apr 14 2010 Cole Robinson - 0.8.3-3.fc13 +- Fix volume creation from 'New VM' wizard (bz 579039) +- Fix firstrun app lock up when calling PackageKit +- Fix File->Add Connection (bz 580578) + * Mon Mar 22 2010 Cole Robinson - 0.8.3-2.fc13 - Fix using a manual 'default' pool (bz 557020) - Don't force grab focus when app is run (bz 548430)