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

- Fix broken vminstall patch

Browse Source 
virtman-vminstall.diff

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=68
This commit is contained in:
Charles Arnold 2011-09-27 18:22:09 +00:00 committed by Git OBS Bridge
parent 7328e322ef
commit 09fe6ffc53
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virt-manager.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 27 12:01:53 MDT 2011 - carnold@novell.com
- Fix broken vminstall patch
virtman-vminstall.diff
-------------------------------------------------------------------
Wed Sep 21 11:29:17 MDT 2011 - carnold@novell.com

10
virtman-vminstall.diff
View File

@ -22,19 +22,19 @@ Index: virt-manager-0.9.0/src/virtManager/engine.py
- self._get_create_dialog().show(src.topwin, uri)
- except Exception, e:
- src.err.show_err(_("Error launching manager: %s") % str(e))
+ conn = self._lookup_connection(uri)
+ conn = self._lookup_conn(uri)
+ do_remote = conn.is_remote()
+ if self.windowCreate == None or do_remote != self.remote_install:
+ try:
+ if do_remote:
+ from virtManager.create import vmmCreate
+ create = vmmCreate(self)
+ create.connect("action-show-console", self._do_show_console)
+ create.connect("action-show-vm", self._do_show_vm)
+ 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)
+ self.windowCreate.show(src.topwin, uri)
+ else:
+ from vminstall.gtk.interface import VMCreate as vmmCreate
+ create = vmmCreate(virtman=True,key=0)
@ -42,13 +42,13 @@ Index: virt-manager-0.9.0/src/virtManager/engine.py
+ create.connect("vmmcreate-closing", self._vmmcreate_closing)
+ self.remote_install = False
+ self.windowCreate = create
+ self.windowCreate.show()
+ self.windowCreate.show(src.topwin)
+ except Exception, e:
+ src.err.show_err(_("Error launching manager: %s") % str(e),
+ "".join(traceback.format_exc()))
+ else:
+ if do_remote:
+ self.windowCreate.show(uri)
+ self.windowCreate.show(src.topwin, uri)
+ else:
+ message_box = gtk.MessageDialog(None,
+ gtk.DIALOG_MODAL,