Hello community, here is the log from the commit of package virt-manager checked in at Mon Feb 4 17:42:10 CET 2008. -------- --- arch/i386/virt-manager/virt-manager.changes 2008-02-03 22:15:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2008-02-04 02:06:08.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Feb 3 17:59:22 MST 2008 - dpmerrill@novell.com + +- Added virtman-vminstall for connecting to vm-install +- and changed virtman-xen-uri.diff to force "xen:///" +- bnc#358400 + +------------------------------------------------------------------- New: ---- virtman-vminstall.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.a28439/_old 2008-02-04 17:42:00.000000000 +0100 +++ /var/tmp/diff_new_pack.a28439/_new 2008-02-04 17:42:00.000000000 +0100 @@ -18,7 +18,7 @@ %define virtinst_rel 2 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} Version: 0.5.3 -Release: 1 +Release: 2 Summary: Virtual Machine Manager Group: System/Monitoring License: GPL v2 or later @@ -30,6 +30,7 @@ Patch0: virtman-desktop.diff Patch1: virtman-dbus-query.diff Patch2: virtman-xen-uri.diff +Patch3: virtman-vminstall.diff # These two are just the oldest version tested # Requires: pygtk2 >= 1.99.12-6 Requires: python-gtk @@ -101,6 +102,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # autoreconf -i @@ -185,6 +187,10 @@ %changelog * Sun Feb 03 2008 dpmerrill@novell.com +- Added virtman-vminstall for connecting to vm-install +- and changed virtman-xen-uri.diff to force "xen:///" +- bnc#358400 +* Sun Feb 03 2008 dpmerrill@novell.com - Added virtman-xen-uri.diff to fix problem starting vnc. - virtman was getting confused between "xen" and "xen:///" uris. - bnc#358397 ++++++ virtman-vminstall.diff ++++++ diff -Nuar virt-manager-0.5.3.orig/src/virtManager/engine.py virt-manager-0.5.3/src/virtManager/engine.py --- virt-manager-0.5.3.orig/src/virtManager/engine.py 2008-02-03 17:05:01.000000000 -0700 +++ virt-manager-0.5.3/src/virtManager/engine.py 2008-02-03 17:05:23.000000000 -0700 @@ -34,7 +34,7 @@ from virtManager.details import vmmDetails from virtManager.console import vmmConsole from virtManager.asyncjob import vmmAsyncJob -from virtManager.create import vmmCreate +from vminstall.gtk.interface import VMCreate as vmmCreate from virtManager.serialcon import vmmSerialConsole from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog @@ -52,7 +52,7 @@ self.windowConnect = None self.windowPreferences = None self.windowAbout = None - self.windowCreate = None + self.windowCreate = {} self.windowManager = None self.connections = {} @@ -311,10 +311,15 @@ con = self.get_connection(uri) if self.connections[uri]["windowCreate"] == None: - create = vmmCreate(self.get_config(), con) + key = 0 + while self.windowCreate.has_key( key ): + key += 1 + create = vmmCreate(virtman=True, key=key) + self.windowCreate[key] = create create.connect("action-show-console", self._do_show_console) create.connect("action-show-terminal", self._do_show_terminal) - create.connect("action-show-help", self._do_show_help) + # make sure the help matches before showing it + # create.connect("action-show-help", self._do_show_help) self.connections[uri]["windowCreate"] = create self.connections[uri]["windowCreate"].show() ++++++ virtman-xen-uri.diff ++++++ --- /var/tmp/diff_new_pack.a28439/_old 2008-02-04 17:42:01.000000000 +0100 +++ /var/tmp/diff_new_pack.a28439/_new 2008-02-04 17:42:01.000000000 +0100 @@ -1,13 +1,26 @@ -Index: virt-manager-0.5.3/src/virtManager/connection.py +Index: virt-manager-0.5.3/src/virtManager/connect.py =================================================================== ---- virt-manager-0.5.3.orig/src/virtManager/connection.py 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/virtManager/connection.py 2008-02-03 13:36:26.000000000 -0700 -@@ -117,7 +117,7 @@ - self.connectError = None - self.uri = uri - if self.uri is None or self.uri.lower() == "xen": -- self.uri = "xen:///" -+ self.uri = "xen" - - self.state = self.STATE_DISCONNECTED - self.vmm = None +--- virt-manager-0.5.3.orig/src/virtManager/connect.py 2008-01-10 18:17:51.000000000 -0700 ++++ virt-manager-0.5.3/src/virtManager/connect.py 2008-02-03 17:30:24.000000000 -0700 +@@ -95,7 +95,7 @@ + pass + elif hv == HV_XEN: + if conn == CONN_LOCAL: +- uri = "xen" ++ uri = "xen:///" + if os.getuid() != 0: + readOnly = True + elif conn == CONN_TLS: +Index: virt-manager-0.5.3/src/virt-manager.py.in +=================================================================== +--- virt-manager-0.5.3.orig/src/virt-manager.py.in 2008-01-10 18:17:51.000000000 -0700 ++++ virt-manager-0.5.3/src/virt-manager.py.in 2008-02-03 17:28:34.000000000 -0700 +@@ -172,7 +172,7 @@ + if engine.config.get_connections() is None or len(engine.config.get_connections()) == 0: + tryuri = None + if os.path.exists("/var/lib/xend") and os.path.exists("/proc/xen"): +- tryuri = "xen" ++ tryuri = "xen:///" + elif os.path.exists("/usr/bin/qemu"): + if os.getuid() == 0: + tryuri = "qemu:///system" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org