Mailinglist Archive: opensuse-commit (1097 mails)
| < Previous | Next > |
commit virt-manager for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 09 Jan 2010 11:50:26 +0100
- Message-id: <20100109105026.B317F2029B@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at Sat Jan 9 11:50:26 CET 2010.
--------
--- virt-manager/virt-manager.changes 2009-10-09 19:21:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes
2010-01-09 00:18:54.000000000 +0100
@@ -1,0 +2,46 @@
+Thu Jan 7 12:04:09 MST 2010 - carnold@xxxxxxxxxx
+
+- Update to virt-manager version 0.8.2
+ * Right click in the manager window operates on the clicked row,
+ NOT the last selected row. This could cause an admin to
+ accidentally shut down the wrong machine.
+ * Running virt-manager on a new machine / user account no longer
+ produces a traceback.
+ * Allow ejecting and connecting floppy media
+
+-------------------------------------------------------------------
+Fri Dec 11 15:59:53 MST 2009 - carnold@xxxxxxxxxx
+
+- First time running virt-manager throws exception in engine.py
+ add_connection().
+ virtman-autoconnect.diff
+
+-------------------------------------------------------------------
+Thu Dec 3 17:18:37 MST 2009 - carnold@xxxxxxxxxx
+
+- Update to virt-manager version 0.8.1
+ * VM Migration wizard, exposing various migration options
+ * Enumerate CDROM and bridge devices on remote connections
+ * Can once again list multiple graphs in main manager window (Jon Nordby)
+ * Support disabling dhcp (Michal Novotny), and specifying 'routed' type for
new virtual networks
+ * Support storage pool source enumeration for LVM, NFS, and SCSI
+ * Allow changing VM ACPI, APIC, clock offset, individual vcpu pinning, and
video model (vga, cirrus, etc.)
+ * Many improvements and bugfixes
+
+-------------------------------------------------------------------
+Wed Nov 11 11:49:22 MST 2009 - carnold@xxxxxxxxxx
+
+- bnc#552785 - virt-manager cannot connect to xend when started
+ from an ordinary user's X session
+ virtman-desktop.diff
+
+-------------------------------------------------------------------
+Tue Nov 10 13:04:38 MST 2009 - carnold@xxxxxxxxxx
+
+- bnc#553633 - Update breaks menu access keys in virt-viewer and
+ still misses some key sequences.
+ This is a SLE10 bug fixed for the virt-manager viewer in all
+ versions.
+ virtman-keycombo.diff
+
+-------------------------------------------------------------------
@@ -34,0 +81,5 @@
+Wed May 13 11:32:20 MDT 2009 - dpmerrill@xxxxxxxxxx
+
+- Use "graphics listen" for vnc connection (bnc#436629)
+
+-------------------------------------------------------------------
@@ -52,0 +104,6 @@
+
+-------------------------------------------------------------------
+Fri Jan 23 16:55:15 MST 2009 - dpmerrill@xxxxxxxxxx
+
+- Remove unsupported SCSI disk option (bnc#464293)
+- Change cdrom start node to hdc instead of hdb (bnc#376935)
calling whatdependson for head-i586
Old:
----
1240-cdrom-driver-name.patch
1242-delete-active-vm.patch
1243-syntax-typo.patch
1245-storage-browser-selection.patch
1248-libvirt-connection.patch
1262-vcpu-hotplug-fix.patch
virt-manager-0.8.0.tar.bz2
virtinst-0.500.0.tar.bz2
New:
----
virt-manager-0.8.2.tar.bz2
virtinst-0.500.1.tar.bz2
virtman-autoconnect.diff
virtman-keycombo.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:16.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:16.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package virt-manager (Version 0.8.0)
+# spec file for package virt-manager (Version 0.8.2)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -23,33 +23,29 @@
%define gconftool /usr/bin/gconftool-2
%define virtinst_maj 0
%define virtinst_min 500
-%define virtinst_rel 0
+%define virtinst_rel 1
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
-Version: 0.8.0
-Release: 4
+Version: 0.8.2
+Release: 1
Summary: Virtual Machine Manager
Group: System/Monitoring
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Url: http://virt-manager.et.redhat.com
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64
Source0: virt-manager-%{version}.tar.bz2
Source1: %{virtinst_name}.tar.bz2
-Patch0: 1240-cdrom-driver-name.patch
-Patch1: 1242-delete-active-vm.patch
-Patch2: 1243-syntax-typo.patch
-Patch3: 1245-storage-browser-selection.patch
-Patch4: 1248-libvirt-connection.patch
-Patch5: 1262-vcpu-hotplug-fix.patch
-Patch51: virtman-desktop.diff
-Patch52: virtman-vminstall.diff
-Patch53: virtman-netcat.diff
-Patch54: virtman-pointer.diff
-Patch55: virtman-cdrom.diff
-Patch56: virtman-kvm.diff
-Patch57: virtman-bridge.diff
-Patch58: virtman-manager.diff
-Patch59: virtman-help.diff
+Patch50: virtman-desktop.diff
+Patch51: virtman-vminstall.diff
+Patch52: virtman-netcat.diff
+Patch53: virtman-pointer.diff
+Patch54: virtman-cdrom.diff
+Patch55: virtman-kvm.diff
+Patch56: virtman-bridge.diff
+Patch57: virtman-manager.diff
+Patch58: virtman-help.diff
+Patch59: virtman-keycombo.diff
+Patch60: virtman-autoconnect.diff
Patch81: virtinst-cdrom.diff
# Requires: pygtk2 >= 1.99.12-6
Requires: python-gtk
@@ -123,21 +119,17 @@
%prep
%setup -q
%setup -b 1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch50 -p1
%patch51 -p1
%patch52 -p1
-%patch53 -p1
+#%patch53 -p1
%patch54 -p1
%patch55 -p1
-%patch56 -p1
+#%patch56 -p1
#%patch57 -p1
%patch58 -p1
%patch59 -p1
+%patch60 -p1
pushd $RPM_BUILD_DIR/%{virtinst_name}
%patch81 -p1
popd
@@ -234,14 +226,14 @@
%{_datadir}/applications/YaST2/%{name}.desktop
%{_datadir}/dbus-1/services/%{name}.service
%{_datadir}/man/man1/%{name}.1*
-# new files for virt-manager-0.7.0
+# new files for virt-manager-0.8.1
%dir %{_datadir}/%{name}/virtconv
%{_datadir}/%{name}/virtconv/*.py
%{_datadir}/%{name}/virtconv/*.pyc
%dir %{_datadir}/%{name}/virtconv/parsers
%{_datadir}/%{name}/virtconv/parsers/*.py
%{_datadir}/%{name}/virtconv/parsers/*.pyc
-%{_datadir}/%{name}/virtinst-0.500.0-py2.6.egg-info
+%{_datadir}/%{name}/virtinst-0.500.1-py2.6.egg-info
%doc %{_datadir}/gnome/help/%{name}/C/figures/*.png
%doc %{_datadir}/gnome/help/%{name}/C/*.xml
# FIXME: autobuild complains that these are unowned (not true...)
++++++ virt-manager-0.8.0.tar.bz2 -> virt-manager-0.8.2.tar.bz2 ++++++
++++ 279645 lines of diff (skipped)
++++++ virtinst-0.500.0.tar.bz2 -> virtinst-0.500.1.tar.bz2 ++++++
++++ 31098 lines of diff (skipped)
++++++ virtinst-cdrom.diff ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:18.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:18.000000000 +0100
@@ -1,8 +1,8 @@
-Index: virtinst-0.500.0/virtinst/VirtualDisk.py
+Index: virtinst-0.500.1/virtinst/VirtualDisk.py
===================================================================
---- virtinst-0.500.0.orig/virtinst/VirtualDisk.py
-+++ virtinst-0.500.0/virtinst/VirtualDisk.py
-@@ -1181,14 +1181,18 @@ class VirtualDisk(VirtualDevice):
+--- virtinst-0.500.1.orig/virtinst/VirtualDisk.py
++++ virtinst-0.500.1/virtinst/VirtualDisk.py
+@@ -1354,14 +1354,18 @@ class VirtualDisk(VirtualDevice):
return self.target
raise ValueError(_("IDE CDROM must use 'hdc', but target in
use."))
++++++ virtman-autoconnect.diff ++++++
Index: virt-manager-0.8.2/src/virtManager/engine.py
===================================================================
--- virt-manager-0.8.2.orig/src/virtManager/engine.py
+++ virt-manager-0.8.2/src/virtManager/engine.py
@@ -470,7 +470,7 @@ class vmmEngine(gobject.GObject):
self.emit("connection-added", conn)
self.config.add_connection(conn.get_uri())
if autoconnect:
- conn.set_autoconnect(True)
+ self.connect_to_uri(uri)
return conn
++++++ virtman-cdrom.diff ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:18.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:18.000000000 +0100
@@ -1,11 +1,11 @@
-Index: virt-manager-0.8.0/src/virtManager/addhardware.py
+Index: virt-manager-0.8.2/src/virtManager/addhardware.py
===================================================================
---- virt-manager-0.8.0.orig/src/virtManager/addhardware.py
-+++ virt-manager-0.8.0/src/virtManager/addhardware.py
-@@ -1298,6 +1298,7 @@ class vmmAddHardware(gobject.GObject):
- if self.vm.get_hv_type().lower() == "kvm":
+--- virt-manager-0.8.2.orig/src/virtManager/addhardware.py
++++ virt-manager-0.8.2/src/virtManager/addhardware.py
+@@ -465,6 +465,7 @@ class vmmAddHardware(gobject.GObject):
+ if self.vm.get_hv_type() == "kvm":
add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk")
- if self.vm.get_connection().get_type().lower() == "xen":
+ if self.vm.get_connection().is_xen():
+ add_dev("xen", virtinst.VirtualDisk.DEVICE_CDROM, "Virtual disk
(read only)")
add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, "Virtual disk")
++++++ virtman-desktop.diff ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:18.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:18.000000000 +0100
@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.0/src/Makefile.am
+Index: virt-manager-0.8.2/src/Makefile.am
===================================================================
---- virt-manager-0.8.0.orig/src/Makefile.am
-+++ virt-manager-0.8.0/src/Makefile.am
+--- virt-manager-0.8.2.orig/src/Makefile.am
++++ virt-manager-0.8.2/src/Makefile.am
@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade)
@@ -11,11 +11,11 @@
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
-Index: virt-manager-0.8.0/src/Makefile.in
+Index: virt-manager-0.8.2/src/Makefile.in
===================================================================
---- virt-manager-0.8.0.orig/src/Makefile.in
-+++ virt-manager-0.8.0/src/Makefile.in
-@@ -258,7 +258,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
+--- virt-manager-0.8.2.orig/src/Makefile.in
++++ virt-manager-0.8.2/src/Makefile.in
+@@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade)
@@ -24,11 +24,11 @@
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services
-Index: virt-manager-0.8.0/src/virt-manager.desktop.in.in
+Index: virt-manager-0.8.2/src/virt-manager.desktop.in.in
===================================================================
---- virt-manager-0.8.0.orig/src/virt-manager.desktop.in.in
-+++ virt-manager-0.8.0/src/virt-manager.desktop.in.in
-@@ -1,9 +1,16 @@
+--- virt-manager-0.8.2.orig/src/virt-manager.desktop.in.in
++++ virt-manager-0.8.2/src/virt-manager.desktop.in.in
+@@ -1,9 +1,20 @@
[Desktop Entry]
_Name=Virtual Machine Manager
_Comment=Manage virtual machines
@@ -42,6 +42,10 @@
Encoding=UTF-8
-Categories=System;
+Categories=Qt;X-SuSE-YaST;
++X-KDE-ModuleType=Library
++X-KDE-RootOnly=true
++X-KDE-HasReadOnlyMode=false
++X-KDE-Library=yast2
+X-SuSE-YaST-Call=/usr/bin/virt-manager -- -c xen:///
+X-SuSE-YaST-Group=Virtualization
+X-SuSE-YaST-Argument=
++++++ virtman-help.diff ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:18.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:18.000000000 +0100
@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.0/help/virt-manager/C/virt-manager.xml
+Index: virt-manager-0.8.2/help/virt-manager/C/virt-manager.xml
===================================================================
---- virt-manager-0.8.0.orig/help/virt-manager/C/virt-manager.xml
-+++ virt-manager-0.8.0/help/virt-manager/C/virt-manager.xml
+--- virt-manager-0.8.2.orig/help/virt-manager/C/virt-manager.xml
++++ virt-manager-0.8.2/help/virt-manager/C/virt-manager.xml
@@ -821,218 +821,9 @@
<title>The Create Wizard</title>
<para>The Create Wizard helps you gather the information necessary to create
++++++ virtman-keycombo.diff ++++++
Index: virt-manager-0.8.2/src/vmm-details.glade
===================================================================
--- virt-manager-0.8.2.orig/src/vmm-details.glade
+++ virt-manager-0.8.2/src/vmm-details.glade
@@ -339,11 +339,85 @@
</widget>
</child>
<child>
+ <widget class="GtkMenuItem"
id="details-menu-send-assesc">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Alt+Shift+Shift+Esc</property>
+ <property name="use_underline">False</property>
+ <signal name="activate"
handler="on_menu_send_assesc_activate" last_modification_time="Wed, 14 Oct 2009
12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
<widget class="GtkSeparatorMenuItem" id="separator9">
<property name="visible">True</property>
</widget>
</child>
<child>
+ <widget class="GtkMenuItem" id="details-menu-send-af10">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">A_lt+F10</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_menu_send_af10_activate" last_modification_time="Wed, 14 Oct 2009
12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-atab">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Alt+_Tab</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_menu_send_atab_activate" last_modification_time="Wed, 14 Oct 2009
12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-astab">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Alt+Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_menu_send_aesc_activate" last_modification_time="Wed, 14 Oct 2009
12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-cesc">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Ctrl+Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_menu_send_cesc_activate" last_modification_time="Wed, 14 Oct 2009
12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-caesc">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Ctrl+Alt+_Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_menu_send_caesc_activate" last_modification_time="Wed, 14 Oct 2009
12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator10">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-f8">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_F8</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_menu_send_f8_activate" last_modification_time="Wed, 09 Jan 2008
19:20:40 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-f10">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">F1_0</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_menu_send_f10_activate" last_modification_time="Wed, 09 Jan 2008
19:20:40 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator13">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkMenuItem" id="details-menu-send-caf1">
<property name="visible">True</property>
<property name="label">Ctrl+Alt+F_1</property>
@@ -440,7 +514,7 @@
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="separator10">
+ <widget class="GtkSeparatorMenuItem" id="separator14">
<property name="visible">True</property>
</widget>
</child>
Index: virt-manager-0.8.2/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.2.orig/src/virtManager/details.py
+++ virt-manager-0.8.2/src/virtManager/details.py
@@ -240,6 +240,14 @@ class vmmDetails(gobject.GObject):
"on_details_menu_send_cad_activate": self.console.send_key,
"on_details_menu_send_cab_activate": self.console.send_key,
+ "on_details_menu_send_assesc_activate": self.console.send_key,
+ "on_details_menu_send_af10_activate": self.console.send_key,
+ "on_details_menu_send_atab_activate": self.console.send_key,
+ "on_details_menu_send_aesc_activate": self.console.send_key,
+ "on_details_menu_send_cesc_activate": self.console.send_key,
+ "on_details_menu_send_caesc_activate": self.console.send_key,
+ "on_details_menu_send_f8_activate": self.console.send_key,
+ "on_details_menu_send_f10_activate": self.console.send_key,
"on_details_menu_send_caf1_activate": self.console.send_key,
"on_details_menu_send_caf2_activate": self.console.send_key,
"on_details_menu_send_caf3_activate": self.console.send_key,
Index: virt-manager-0.8.2/src/virtManager/console.py
===================================================================
--- virt-manager-0.8.2.orig/src/virtManager/console.py
+++ virt-manager-0.8.2/src/virtManager/console.py
@@ -321,6 +321,22 @@ class vmmConsolePages(gobject.GObject):
keys = ["Control_L", "Alt_L", "Delete"]
elif src.get_name() == "details-menu-send-cab":
keys = ["Control_L", "Alt_L", "BackSpace"]
+ elif src.get_name() == "details-menu-send-assesc":
+ keys = ["Alt_R", "Shift_R", "Shift_L", "Escape"]
+ elif src.get_name() == "details-menu-send-af10":
+ keys = ["Alt_L", "F10"]
+ elif src.get_name() == "details-menu-send-atab":
+ keys = ["Alt_L", "Tab"]
+ elif src.get_name() == "details-menu-send-aesc":
+ keys = ["Alt_L", "Escape"]
+ elif src.get_name() == "details-menu-send-cesc":
+ keys = ["Control_L", "Escape"]
+ elif src.get_name() == "details-menu-send-caesc":
+ keys = ["Control_L", "Alt_L", "Escape"]
+ elif src.get_name() == "details-menu-send-f8":
+ keys = ["F8"]
+ elif src.get_name() == "details-menu-send-f10":
+ keys = ["F10"]
elif src.get_name() == "details-menu-send-caf1":
keys = ["Control_L", "Alt_L", "F1"]
elif src.get_name() == "details-menu-send-caf2":
++++++ virtman-kvm.diff ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:18.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:18.000000000 +0100
@@ -1,8 +1,8 @@
-Index: virt-manager-0.8.0/src/virt-manager.py.in
+Index: virt-manager-0.8.2/src/virt-manager.py.in
===================================================================
---- virt-manager-0.8.0.orig/src/virt-manager.py.in
-+++ virt-manager-0.8.0/src/virt-manager.py.in
-@@ -196,7 +196,8 @@ def default_uri():
+--- virt-manager-0.8.2.orig/src/virt-manager.py.in
++++ virt-manager-0.8.2/src/virt-manager.py.in
+@@ -198,7 +198,8 @@ def default_uri():
tryuri = "xen:///"
elif (os.path.exists("/usr/bin/qemu") or
os.path.exists("/usr/bin/qemu-kvm") or
++++++ virtman-manager.diff ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:18.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:18.000000000 +0100
@@ -1,11 +1,12 @@
-Index: virt-manager-0.8.0/src/virtManager/manager.py
+Index: virt-manager-0.8.1/src/virtManager/manager.py
===================================================================
---- virt-manager-0.8.0.orig/src/virtManager/manager.py
-+++ virt-manager-0.8.0/src/virtManager/manager.py
-@@ -624,6 +624,15 @@ class vmmManager(gobject.GObject):
+--- virt-manager-0.8.1.orig/src/virtManager/manager.py
++++ virt-manager-0.8.1/src/virtManager/manager.py
+@@ -529,7 +529,15 @@ class vmmManager(gobject.GObject):
vmlist = self.window.get_widget("vm-list")
selection = vmlist.get_selection()
active = selection.get_selected()
+-
+ if active[1] == None and active[0] != None:
+ # in some cases on vhost, the connection is not being selected at
startup.
+ # when creating new vms, if current_connection() returns None,
several
@@ -15,11 +16,11 @@
+ if first != None:
+ selection.select_iter( first )
+ active = selection.get_selected()
- if active[1] != None:
- parent = active[0].iter_parent(active[1])
- # return the connection of the currently selected vm, or the
-@@ -769,7 +778,14 @@ class vmmManager(gobject.GObject):
- return False
+ treestore, treeiter = active
+ if treeiter != None:
+ return treestore[treeiter]
+@@ -583,7 +591,14 @@ class vmmManager(gobject.GObject):
+ self.emit("action-show-connect")
def new_vm(self, ignore=None):
- self.emit("action-show-create", self.current_connection_uri())
@@ -32,5 +33,5 @@
+ message_box.run()
+ message_box.destroy()
- def delete_vm(self, ignore=None):
- conn = self.current_connection()
+ def show_about(self, src):
+ self.emit("action-show-about")
++++++ virtman-netcat.diff ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:18.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:18.000000000 +0100
@@ -1,13 +1,13 @@
-Index: virt-manager-0.8.0/src/virtManager/details.py
+Index: virt-manager-0.8.2/src/virtManager/console.py
===================================================================
---- virt-manager-0.8.0.orig/src/virtManager/details.py
-+++ virt-manager-0.8.0/src/virtManager/details.py
-@@ -1308,7 +1308,7 @@ class vmmDetails(gobject.GObject):
- argv = ["ssh", "ssh", "-p", sshport]
- if username:
- argv += ['-l', username]
-- argv += [ server, "nc", vncaddr, str(vncport) ]
-+ argv += [ server, "netcat", vncaddr, str(vncport) ]
- os.execlp(*argv)
- os._exit(1)
- else:
+--- virt-manager-0.8.2.orig/src/virtManager/console.py
++++ virt-manager-0.8.2/src/virtManager/console.py
+@@ -506,7 +506,7 @@ class vmmConsolePages(gobject.GObject):
+ if username:
+ argv += ['-l', username]
+
+- argv += [ server, "nc", vncaddr, str(vncport) ]
++ argv += [ server, "netcat", vncaddr, str(vncport) ]
+
+ logging.debug("Creating SSH tunnel: %s" % argv)
+
++++++ virtman-pointer.diff ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:18.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:18.000000000 +0100
@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.0/src/virtManager/details.py
+Index: virt-manager-0.8.1/src/virtManager/console.py
===================================================================
---- virt-manager-0.8.0.orig/src/virtManager/details.py
-+++ virt-manager-0.8.0/src/virtManager/details.py
+--- virt-manager-0.8.1.orig/src/virtManager/console.py
++++ virt-manager-0.8.1/src/virtManager/console.py
@@ -205,10 +205,10 @@ class vmmDetails(gobject.GObject):
self.window.get_widget("console-vnc-viewport").add(self.vncViewer)
self.vncViewer.realize()
++++++ virtman-vminstall.diff ++++++
--- /var/tmp/diff_new_pack.OGbZUg/_old 2010-01-09 11:50:18.000000000 +0100
+++ /var/tmp/diff_new_pack.OGbZUg/_new 2010-01-09 11:50:18.000000000 +0100
@@ -1,9 +1,9 @@
-Index: virt-manager-0.8.0/src/virtManager/engine.py
+Index: virt-manager-0.8.2/src/virtManager/engine.py
===================================================================
---- virt-manager-0.8.0.orig/src/virtManager/engine.py
-+++ virt-manager-0.8.0/src/virtManager/engine.py
-@@ -37,7 +37,8 @@ from virtManager.preferences import vmmP
- from virtManager.manager import vmmManager
+--- virt-manager-0.8.2.orig/src/virtManager/engine.py
++++ virt-manager-0.8.2/src/virtManager/engine.py
+@@ -38,7 +38,8 @@ 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
@@ -12,7 +12,7 @@
from virtManager.host import vmmHost
from virtManager.error import vmmErrorDialog
from virtManager.systray import vmmSystray
-@@ -394,13 +395,24 @@ class vmmEngine(gobject.GObject):
+@@ -435,13 +436,24 @@ class vmmEngine(gobject.GObject):
return False
return True
@@ -39,4 +39,4 @@
+ message_box.destroy()
def add_connection(self, uri, readOnly=None, autoconnect=False):
- conn = vmmConnection(self.get_config(), uri, readOnly,
+ conn = vmmConnection(self.get_config(), uri, readOnly, self)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |