OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=16

virt-manager.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Apr 24 16:42:16 MDT 2008 - dpmerrill@novell.com
+
+- Added python-gtk-devel and python-gobject2-devel to spec file
+  to reflect changes in OpenSuse11.0
+
+-------------------------------------------------------------------
+Tue Apr 22 13:57:10 MDT 2008 - dpmerrill@novell.com
+
+- Changed desktop file for starting from KDE (bnc#377277) 
+
+-------------------------------------------------------------------
+Mon Apr 21 15:57:47 MDT 2008 - dpmerrill@novell.com
+
+- Changed "SendKey" to send "Delete" instead of "Del" (bnc#381897) 
+
+-------------------------------------------------------------------
+Fri Apr 18 15:51:50 MDT 2008 - dpmerrill@novell.com
+
+- Added vncViewerMaxRetries to prevent showing expected libvirt
+  exceptions from cluttering the error log (bnc#366792) 
+
 -------------------------------------------------------------------
 Wed Apr  9 11:07:56 MDT 2008 - dpmerrill@novell.com
 

virt-manager.spec

@@ -19,7 +19,7 @@ Name:           virt-manager
 %define virtinst_rel 2
 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
 Version:        0.5.3
-Release:        5
+Release:        6
 Summary:        Virtual Machine Manager
 Group:          System/Monitoring
 License:        GPL v2 or later
@@ -80,6 +80,8 @@ BuildRequires:  gettext
 BuildRequires:  scrollkeeper
 BuildRequires:  intltool
 BuildRequires:  python-gtk
+BuildRequires:  python-gtk-devel
+BuildRequires:  python-gobject2-devel
 BuildRequires:  gconf2
 BuildRequires:  desktop-file-utils
 BuildRequires:  update-desktop-files
@@ -132,7 +134,7 @@ python setup.py install
 %install
 rm -rf $RPM_BUILD_ROOT
 make install  DESTDIR=$RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT%{_datadir}/virt-manager/virtinst/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/virt-manager/virtinst/
 install -m644 ../%{virtinst_name}/virtinst/*.py $RPM_BUILD_ROOT%{_datadir}/virt-manager/virtinst/
 # install -m644 ../virtinst-0.300.2/virtinst/*.py $RPM_BUILD_ROOT%{_datadir}/virt-manager/virtinst/
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a
@@ -203,6 +205,16 @@ fi
 %dir %{_datadir}/applications/YaST2
 
 %changelog
+* Thu Apr 24 2008 dpmerrill@novell.com
+- Added python-gtk-devel and python-gobject2-devel to spec file
+  to reflect changes in OpenSuse11.0
+* Tue Apr 22 2008 dpmerrill@novell.com
+- Changed desktop file for starting from KDE (bnc#377277)
+* Mon Apr 21 2008 dpmerrill@novell.com
+- Changed "SendKey" to send "Delete" instead of "Del" (bnc#381897)
+* Fri Apr 18 2008 dpmerrill@novell.com
+- Added vncViewerMaxRetries to prevent showing expected libvirt
+  exceptions from cluttering the error log (bnc#366792)
 * Wed Apr 09 2008 dpmerrill@novell.com
 - Changed vnc settings to prevent screen-saver lockup (bnc#253264)
 - Added read-only option in Details->Hardware for adding cdroms

virtman-desktop.diff

@@ -23,13 +23,13 @@ Index: virt-manager-0.5.3/src/virt-manager.desktop.in.in
 -Icon=::ICONDIR::/::PACKAGE::-icon.svg
 -Exec=::PACKAGE::
 +Icon=yast-vm-management
-+Exec=/usr/bin/virt-manager -c xen
++Exec=/usr/bin/virt-manager -c xen:///
  Type=Application
  Terminal=false
  Encoding=UTF-8
 -Categories=System;
 +Categories=Qt;X-SuSE-YaST;
-+X-SuSE-YaST-Call=/usr/bin/virt-manager -c xen:///
++X-SuSE-YaST-Call=/usr/bin/virt-manager -- -c xen:///
 +X-SuSE-YaST-Group=Virtualization
 +X-SuSE-YaST-Argument=
 +X-SuSE-YaST-RootOnly=true

virtman-misc.diff

@@ -1,6 +1,6 @@
 diff -Nuar virt-manager-0.5.3.orig/src/virtManager/addhardware.py virt-manager-0.5.3/src/virtManager/addhardware.py
---- virt-manager-0.5.3.orig/src/virtManager/addhardware.py	2008-04-01 15:45:42.000000000 -0600
+--- virt-manager-0.5.3.orig/src/virtManager/addhardware.py	2008-04-21 15:48:21.000000000 -0600
-+++ virt-manager-0.5.3/src/virtManager/addhardware.py	2008-04-01 15:48:23.000000000 -0600
++++ virt-manager-0.5.3/src/virtManager/addhardware.py	2008-04-21 15:49:44.000000000 -0600
 @@ -704,7 +704,7 @@
                                                    device=device)
                  if self._disk.type == virtinst.VirtualDisk.TYPE_FILE and \
@@ -10,9 +10,66 @@ diff -Nuar virt-manager-0.5.3.orig/src/virtManager/addhardware.py virt-manager-0
              except ValueError, e:
                  self._validation_error_box(_("Invalid Storage Parameters"), \
                                              str(e))
+diff -Nuar virt-manager-0.5.3.orig/src/virtManager/console.py virt-manager-0.5.3/src/virtManager/console.py
+--- virt-manager-0.5.3.orig/src/virtManager/console.py	2008-04-21 15:48:21.000000000 -0600
++++ virt-manager-0.5.3/src/virtManager/console.py	2008-04-21 15:50:39.000000000 -0600
+@@ -91,6 +91,7 @@
+ 
+         self.vncViewer.show()
+         self.vncViewerRetriesScheduled = 0
++        self.vncViewerMaxRetries = 10
+         self.vncViewerRetryDelay = 125
+         self.vncViewer.connect("size-request", self._force_resize)
+         self.connected = 0
+@@ -204,7 +205,7 @@
+     def send_key(self, src):
+         keys = None
+         if src.get_name() == "menu-send-cad":
+-            keys = ["Control_L", "Alt_L", "Del"]
++            keys = ["Control_L", "Alt_L", "Delete"]
+         elif src.get_name() == "menu-send-cab":
+             keys = ["Control_L", "Alt_L", "BackSpace"]
+         elif src.get_name() == "menu-send-caf1":
+@@ -374,7 +375,7 @@
+ 
+     def schedule_retry(self):
+         self.vncViewerRetriesScheduled = self.vncViewerRetriesScheduled + 1
+-        if self.vncViewerRetriesScheduled >= 10:
++        if self.vncViewerRetriesScheduled >= self.vncViewerMaxRetries:
+             logging.error("Too many connection failures, not retrying again")
+             return
+         logging.warn("Retrying connection in %d ms", self.vncViewerRetryDelay)
+@@ -387,9 +388,15 @@
+             return
+         gtk.gdk.threads_enter()
+         try:
+-            logging.debug("Got timed retry")
+-            self.try_login()
+-            return
++            try:
++                logging.debug("Got timed retry")
++                self.try_login()
++                return
++            except libvirt.libvirtError, e:
++                # libvirtError is expected when vm is inactive during a reboot
++                # only show exception if it is going to cause a viewer failure
++                if self.vncViewerRetriesScheduled >= self.vncViewerMaxRetries - 1:
++                    logging.error("Login error: %s" % str(e))
+         finally:
+             gtk.gdk.threads_leave()
+ 
+@@ -484,7 +491,7 @@
+                 self.vncViewer.set_credential(credList[i], "libvirt-vnc")
+             else:
+                 # Force it to stop re-trying
+-                self.vncViewerRetriesScheduled = 10
++                self.vncViewerRetriesScheduled = self.vncViewerMaxRetries
+                 self.vncViewer.close()
+                 self.activate_unavailable_page(_("Unsupported console authentication type"))
+ 
 diff -Nuar virt-manager-0.5.3.orig/src/virtManager/details.py virt-manager-0.5.3/src/virtManager/details.py
 --- virt-manager-0.5.3.orig/src/virtManager/details.py	2008-01-10 18:17:51.000000000 -0700
-+++ virt-manager-0.5.3/src/virtManager/details.py	2008-04-01 15:48:40.000000000 -0600
++++ virt-manager-0.5.3/src/virtManager/details.py	2008-04-21 15:50:06.000000000 -0600
 @@ -553,7 +553,7 @@
                  else:
                      vnic = virtinst.VirtualNetworkInterface(type=netinfo[0], macaddr=netinfo[3])