Mailinglist Archive: opensuse-commit (861 mails)
| < Previous | Next > |
commit virt-manager for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 15 Jan 2011 03:22:26 +0100
- Message-id: <20110115022226.3C1D0202AD@hilbert.suse.de>
Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at Sat Jan 15 03:22:26 CET 2011.
--------
--- virt-manager/virt-manager.changes 2010-10-22 14:17:46.000000000 +0200
+++ virt-manager/virt-manager.changes 2011-01-08 00:33:11.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Jan 7 16:31:05 MST 2011 - carnold@xxxxxxxxxx
+
+- bnc#641977 - virt-manager can't create kvm virtual Machines on a
+ remote host.
+
+-------------------------------------------------------------------
+Mon Dec 20 14:01:21 MST 2010 - carnold@xxxxxxxxxx
+
+- When installing remote, use virtinst
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.cGKSNO/_old 2011-01-15 03:21:25.000000000 +0100
+++ /var/tmp/diff_new_pack.cGKSNO/_new 2011-01-15 03:21:25.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package virt-manager (Version 0.8.5)
+# spec file for package virt-manager
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@
Name: virt-manager
Summary: Virtual Machine Manager
Version: 0.8.5
-Release: 2
+Release: 3
Group: System/Monitoring
License: LGPLv2.1+
Url: http://virt-manager.et.redhat.com
++++++ virt-manager-fix-python27.diff ++++++
--- /var/tmp/diff_new_pack.cGKSNO/_old 2011-01-15 03:21:25.000000000 +0100
+++ /var/tmp/diff_new_pack.cGKSNO/_new 2011-01-15 03:21:25.000000000 +0100
@@ -1,10 +1,8 @@
-Index: b/src/virt-manager.py.in
+Index: virt-manager-0.8.5/src/virt-manager.py.in
===================================================================
---- a/src/virt-manager.py.in
-+++ b/src/virt-manager.py.in
-@@ -271,11 +271,11 @@ def main():
- # Urgh, pygtk merely logs a warning when failing to open
- # the X11 display connection, and lets everything carry
+--- virt-manager-0.8.5.orig/src/virt-manager.py.in
++++ virt-manager-0.8.5/src/virt-manager.py.in
+@@ -278,7 +278,7 @@ def main():
# on as if all were fine. Ultimately bad stuff happens,
# so lets catch it here & get the hell out...
import warnings
@@ -13,5 +11,3 @@
try:
import gobject
- # Set program name for gnome shell (before importing gtk, which
- # seems to call set_prgname on its own)
++++++ virtman-autoconnect.diff ++++++
--- /var/tmp/diff_new_pack.cGKSNO/_old 2011-01-15 03:21:25.000000000 +0100
+++ /var/tmp/diff_new_pack.cGKSNO/_new 2011-01-15 03:21:25.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- virt-manager-0.8.5.orig/src/virtManager/engine.py
+++ virt-manager-0.8.5/src/virtManager/engine.py
-@@ -704,7 +704,7 @@ class vmmEngine(gobject.GObject):
+@@ -719,7 +719,7 @@ class vmmEngine(gobject.GObject):
self.emit("connection-added", conn)
self.config.add_connection(conn.get_uri())
if autoconnect:
++++++ virtman-desktop.diff ++++++
--- /var/tmp/diff_new_pack.cGKSNO/_old 2011-01-15 03:21:25.000000000 +0100
+++ /var/tmp/diff_new_pack.cGKSNO/_new 2011-01-15 03:21:25.000000000 +0100
@@ -2,9 +2,7 @@
===================================================================
--- virt-manager-0.8.5.orig/src/Makefile.am
+++ virt-manager-0.8.5/src/Makefile.am
-@@ -12,11 +12,11 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
- libexec_SCRIPTS = $(PACKAGE)-launch
-
+@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade)
@@ -13,15 +11,11 @@
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
- dbusdir = $(datadir)/dbus-1/services
- dbus_DATA_IN = $(PACKAGE).service.in
Index: virt-manager-0.8.5/src/Makefile.in
===================================================================
--- virt-manager-0.8.5.orig/src/Makefile.in
+++ virt-manager-0.8.5/src/Makefile.in
-@@ -237,11 +237,11 @@ python_DATA_IN = $(PACKAGE).py.in
- python_DATA = $(PACKAGE).py
- libexec_DATA_IN = $(PACKAGE)-launch.in
+@@ -239,7 +239,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade)
@@ -30,8 +24,6 @@
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services
- dbus_DATA_IN = $(PACKAGE).service.in
- dbus_DATA = $(PACKAGE).service
Index: virt-manager-0.8.5/src/virt-manager.desktop.in.in
===================================================================
--- virt-manager-0.8.5.orig/src/virt-manager.desktop.in.in
++++++ virtman-kvm.diff ++++++
--- /var/tmp/diff_new_pack.cGKSNO/_old 2011-01-15 03:21:25.000000000 +0100
+++ /var/tmp/diff_new_pack.cGKSNO/_new 2011-01-15 03:21:25.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- virt-manager-0.8.5.orig/src/virtManager/engine.py
+++ virt-manager-0.8.5/src/virtManager/engine.py
-@@ -71,6 +71,7 @@ def default_uri():
+@@ -69,6 +69,7 @@ def default_uri():
os.path.exists("/usr/bin/qemu") or
os.path.exists("/usr/bin/qemu-kvm") or
os.path.exists("/usr/bin/kvm") or
++++++ virtman-vminstall.diff ++++++
--- /var/tmp/diff_new_pack.cGKSNO/_old 2011-01-15 03:21:25.000000000 +0100
+++ /var/tmp/diff_new_pack.cGKSNO/_new 2011-01-15 03:21:25.000000000 +0100
@@ -2,17 +2,15 @@
===================================================================
--- virt-manager-0.8.5.orig/src/virtManager/engine.py
+++ virt-manager-0.8.5/src/virtManager/engine.py
-@@ -40,7 +40,8 @@ from virtManager.manager import vmmManag
+@@ -40,7 +40,6 @@ from virtManager.manager import vmmManag
from virtManager.migrate import vmmMigrateDialog
from virtManager.details import vmmDetails
from virtManager.asyncjob import vmmAsyncJob
-from virtManager.create import vmmCreate
-+#from virtManager.create import vmmCreate
-+from vminstall.gtk.interface import VMCreate as vmmCreate
from virtManager.host import vmmHost
from virtManager.error import vmmErrorDialog
from virtManager.systray import vmmSystray
-@@ -665,13 +666,27 @@ class vmmEngine(gobject.GObject):
+@@ -665,13 +664,44 @@ class vmmEngine(gobject.GObject):
return False
return True
@@ -20,26 +18,67 @@
+ self.windowCreate = None
+
def show_create(self, uri):
- if self.windowCreate == None:
+- if self.windowCreate == None:
- create = vmmCreate(self.get_config(), self)
+- create.connect("action-show-console", self._do_show_console)
+- create.connect("action-show-help", self._do_show_help)
+- self.windowCreate = create
+- self.windowCreate.show(uri)
++ conn = self._lookup_connection(uri)
++ do_remote = conn.is_remote()
++ if self.windowCreate == None or do_remote != self.remote_install:
+ try:
-+ create = vmmCreate(virtman=True,key=0)
++ if do_remote:
++ from virtManager.create import vmmCreate
++ create = vmmCreate(self.get_config(),self)
++ create.connect("action-show-console",
self._do_show_console)
++ create.connect("action-show-help", self._do_show_help)
++ create.connect("vmmcreate-closing",
self._vmmcreate_closing)
++ self.remote_install = True
++ self.windowCreate = create
++ self.windowCreate.show(uri)
++ else:
++ from vminstall.gtk.interface import VMCreate as vmmCreate
++ create = vmmCreate(virtman=True,key=0)
++ create.connect("action-show-console",
self._do_show_console)
++ create.connect("vmmcreate-closing",
self._vmmcreate_closing)
++ self.remote_install = False
++ self.windowCreate = create
++ self.windowCreate.show()
+ except Exception, e:
+ self.err.show_err("%s" %
str(e),"".join(traceback.format_exc()))
- create.connect("action-show-console", self._do_show_console)
-- create.connect("action-show-help", self._do_show_help)
-+ create.connect("vmmcreate-closing", self._vmmcreate_closing)
- self.windowCreate = create
-- self.windowCreate.show(uri)
-+ self.windowCreate.show()
+ else:
-+ message_box = gtk.MessageDialog(None,
-+ gtk.DIALOG_MODAL,
-+ gtk.MESSAGE_WARNING,
-+ gtk.BUTTONS_OK,
-+ _("A new installation is already in
progress.\n\nUse the YaST \"Create Virtual Machines\" utility for concurrent
installations."))
-+ message_box.run()
-+ message_box.destroy()
++ if do_remote:
++ self.windowCreate.show(uri)
++ else:
++ message_box = gtk.MessageDialog(None,
++ gtk.DIALOG_MODAL,
++ gtk.MESSAGE_WARNING,
++ gtk.BUTTONS_OK,
++ _("A new installation is already in
progress.\n\nUse the YaST \"Create Virtual Machines\" utility for concurrent
installations."))
++ message_box.run()
++ message_box.destroy()
def add_connection(self, uri, readOnly=None, autoconnect=False):
conn = vmmConnection(self.get_config(), uri, readOnly, self)
+Index: virt-manager-0.8.5/src/virtManager/create.py
+===================================================================
+--- virt-manager-0.8.5.orig/src/virtManager/create.py
++++ virt-manager-0.8.5/src/virtManager/create.py
+@@ -65,6 +65,8 @@ class vmmCreate(gobject.GObject):
+ gobject.TYPE_NONE, (str,str)),
+ "action-show-help": (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE, [str]),
++ "vmmcreate-closing": (gobject.SIGNAL_RUN_FIRST,
++ gobject.TYPE_NONE, (int,)),
+ }
+
+ def __init__(self, config, engine):
+@@ -154,6 +156,7 @@ class vmmCreate(gobject.GObject):
+ self.topwin.present()
+
+ def close(self, ignore1=None, ignore2=None):
++ self.emit('vmmcreate-closing', 0)
+ self.topwin.hide()
+ self.remove_timers()
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |