pool/virt-manager
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- When installing remote, use virtinst

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=42
This commit is contained in:
Charles Arnold 2010-12-20 21:07:40 +00:00 committed by Git OBS Bridge
parent 7e18818ab5
commit 9118de92dc
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virt-manager.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 20 14:01:21 MST 2010 - carnold@novell.com
- When installing remote, use virtinst
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 22 12:16:35 UTC 2010 - seife@opensuse.org Fri Oct 22 12:16:35 UTC 2010 - seife@opensuse.org

23
virtman-vminstall.diff
View File

@ -2,17 +2,15 @@ Index: virt-manager-0.8.5/src/virtManager/engine.py
=================================================================== ===================================================================
--- virt-manager-0.8.5.orig/src/virtManager/engine.py --- virt-manager-0.8.5.orig/src/virtManager/engine.py
+++ virt-manager-0.8.5/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.migrate import vmmMigrateDialog
from virtManager.details import vmmDetails from virtManager.details import vmmDetails
from virtManager.asyncjob import vmmAsyncJob from virtManager.asyncjob import vmmAsyncJob
-from virtManager.create import vmmCreate -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.host import vmmHost
from virtManager.error import vmmErrorDialog from virtManager.error import vmmErrorDialog
from virtManager.systray import vmmSystray from virtManager.systray import vmmSystray
@@ -665,13 +666,27 @@ class vmmEngine(gobject.GObject): @@ -665,13 +664,35 @@ class vmmEngine(gobject.GObject):
return False return False
return True return True
@ -22,13 +20,22 @@ Index: virt-manager-0.8.5/src/virtManager/engine.py
def show_create(self, uri): def show_create(self, uri):
if self.windowCreate == None: if self.windowCreate == None:
- create = vmmCreate(self.get_config(), self) - create = vmmCreate(self.get_config(), self)
- create.connect("action-show-console", self._do_show_console)
- create.connect("action-show-help", self._do_show_help)
+ conn = self._lookup_connection(uri)
+ try: + try:
+ create = vmmCreate(virtman=True,key=0) + if conn.is_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)
+ 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)
+ except Exception, e: + except Exception, e:
+ self.err.show_err("%s" % str(e),"".join(traceback.format_exc())) + 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 = create
- self.windowCreate.show(uri) - self.windowCreate.show(uri)
+ self.windowCreate.show() + self.windowCreate.show()