- Fix _do_show_create() to check for valid uri

- bnc#712214 - virt-manager 0.8.7 declared LGPL-2.1+ but is GPL-2.0+ 

- Fixes to desktop file to be more descriptive

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=57
This commit is contained in:
Charles Arnold 2011-08-26 16:54:22 +00:00 committed by Git OBS Bridge
parent fbb94c4c8f
commit 7a6c6320ae
3 changed files with 32 additions and 6 deletions

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon Aug 15 16:21:55 MDT 2011 - carnold@novell.com
- Fix _do_show_create() to check for valid uri
-------------------------------------------------------------------
Mon Aug 15 08:26:48 MDT 2011 - carnold@novell.com
- bnc#712214 - virt-manager 0.8.7 declared LGPL-2.1+ but is GPL-2.0+
-------------------------------------------------------------------
Fri Aug 12 14:12:06 MDT 2011 - carnold@novell.com
- Fixes to desktop file to be more descriptive
-------------------------------------------------------------------
Wed Jul 20 09:02:38 MDT 2011 - carnold@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package virt-manager
# spec file for package virt-manager (Version 0.8.7)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -30,9 +30,9 @@
Name: virt-manager
Summary: Virtual Machine Manager
Version: 0.8.7
Release: 5
Release: 1
Group: System/Monitoring
License: LGPLv2.1+
License: GPLv2+
Url: http://virt-manager.et.redhat.com
Source0: virt-manager-%{version}.tar.bz2
Source1: %{virtinst_name}.tar.bz2

View File

@ -10,7 +10,15 @@ Index: virt-manager-0.8.7/src/virtManager/engine.py
from virtManager.host import vmmHost
from virtManager.error import vmmErrorDialog
from virtManager.systray import vmmSystray
@@ -705,12 +704,45 @@ class vmmEngine(vmmGObject):
@@ -222,6 +221,7 @@ class vmmEngine(vmmGObject):
self.windowCreate = None
self.windowManager = None
self.windowMigrate = None
+ self.remote_install = False
self.connections = {}
self.err = vmmErrorDialog()
@@ -705,12 +705,48 @@ class vmmEngine(vmmGObject):
self.windowCreate = obj
return self.windowCreate
@ -23,8 +31,11 @@ Index: virt-manager-0.8.7/src/virtManager/engine.py
- except Exception, e:
- src.err.show_err(_("Error launching manager: %s") % str(e),
- "".join(traceback.format_exc()))
+ conn = self._lookup_connection(uri)
+ do_remote = conn.is_remote()
+ if uri:
+ conn = self._lookup_connection(uri)
+ do_remote = conn.is_remote()
+ else:
+ do_remote = False
+ if self.windowCreate == None or do_remote != self.remote_install:
+ try:
+ if do_remote: