[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, master, updated. debian/0.9.0-5-5-gb5c8a1e
Laurent Léonard
laurent at open-minds.org
Thu Feb 2 11:08:31 UTC 2012
The following commit has been merged in the master branch:
commit 6782cf0027c2fb59264d03947e7ea29db4882c92
Author: Laurent Léonard <laurent at open-minds.org>
Date: Thu Feb 2 11:57:32 2012 +0100
Drop patches
0003-virt-manager-Fix-Resize-to-VM-menu-option.patch - fixed upstream http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=a815fa17a7c643ddde8ea326399e2bee449dff98
0004-console-Fix-crashes-when-deleting-vm-on-F16.patch - fixed upstream http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=930a321f8e411cd02f4f43c193f967763e8b6e5c
0005-storagebrowser-ignore-unparseable-volumes.patch - fixed upstream http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=5e77012c768a8baca1260a82ab7980dd519aa6af
0006-Improve-error-message-if-netcat-can-t-forward-Unix-d.patch - fixed upstream http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=2140539c64205f1303a9b9741f37b489c05a495d
0007-console-Fix-hang-when-reconnecting-to-remote-VNC-con.patch - fixed upstream http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=becf776d6af3455f6c89396e3ccc330cd2c85434
diff --git a/debian/patches/0002-Use-IPy-from-python-ipy.patch b/debian/patches/0002-Use-IPy-from-python-ipy.patch
index 5a1dd92..5399a29 100644
--- a/debian/patches/0002-Use-IPy-from-python-ipy.patch
+++ b/debian/patches/0002-Use-IPy-from-python-ipy.patch
@@ -10,7 +10,7 @@ Bug-Debian: http://bugs.debian.org/605967
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/virtManager/createnet.py b/src/virtManager/createnet.py
-index 5bad52e..4b10472 100644
+index 2632b73..6ddab4d 100644
--- a/src/virtManager/createnet.py
+++ b/src/virtManager/createnet.py
@@ -23,7 +23,7 @@ import re
diff --git a/debian/patches/0003-virt-manager-Fix-Resize-to-VM-menu-option.patch b/debian/patches/0003-virt-manager-Fix-Resize-to-VM-menu-option.patch
deleted file mode 100644
index fd3d99a..0000000
--- a/debian/patches/0003-virt-manager-Fix-Resize-to-VM-menu-option.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Marc Deslauriers <marc.deslauriers at canonical.com>
-Date: Fri, 19 Aug 2011 11:50:11 -0400
-Subject: virt-manager: Fix "Resize to VM" menu option
-
-Hello,
-
-This patch fixes the "Resize to VM" menu option by correcting inverted return
-values in autodrawer.py.
-
-Thanks,
-
-Marc.
-
-commit 8e666f4b87926c866ed35e58eb82213d2c514e89
-Author: Marc Deslauriers <marc.deslauriers at ubuntu.com>
-Date: Fri Aug 19 11:46:48 2011 -0400
-
- Fix inverted width and height
-
-Origin: upstream, http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=a815fa17a7c643ddde8ea326399e2bee449dff98
----
- src/virtManager/autodrawer.py | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/virtManager/autodrawer.py b/src/virtManager/autodrawer.py
-index 56a9a80..b82b47b 100644
---- a/src/virtManager/autodrawer.py
-+++ b/src/virtManager/autodrawer.py
-@@ -256,10 +256,10 @@ class OverBox(parentclass):
- self.underWin = None
-
- def do_size_request(self, req):
-- height, width = self._size_request()
-+ width, height = self._size_request()
-
-- req.height = height
- req.width = width
-+ req.height = height
-
- def do_size_allocate(self, newalloc):
- self.allocation = newalloc
---
diff --git a/debian/patches/0004-console-Fix-crashes-when-deleting-vm-on-F16.patch b/debian/patches/0004-console-Fix-crashes-when-deleting-vm-on-F16.patch
deleted file mode 100644
index 2871f80..0000000
--- a/debian/patches/0004-console-Fix-crashes-when-deleting-vm-on-F16.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Fri, 28 Oct 2011 12:20:11 -0400
-Subject: console: Fix crashes when deleting vm on F16
-
-The toolbar cleanup order was causing crashed on f16 at app shutdown or
-VM delete (when a console window is fully uninstantiated)
-
-Origin: upstream, http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=930a321f8e411cd02f4f43c193f967763e8b6e5c
-Bug-Debian: http://bugs.debian.org/648420
----
- src/virtManager/console.py | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/virtManager/console.py b/src/virtManager/console.py
-index 1bdf26b..bd08cc3 100644
---- a/src/virtManager/console.py
-+++ b/src/virtManager/console.py
-@@ -597,10 +597,10 @@ class vmmConsolePages(vmmGObjectUI):
-
- self.keycombo_menu.destroy()
- self.keycombo_menu = None
-- self.fs_toolbar.destroy()
-- self.fs_toolbar = None
- self.fs_drawer.destroy()
- self.fs_drawer = None
-+ self.fs_toolbar.destroy()
-+ self.fs_toolbar = None
-
- ##########################
- # Initialization helpers #
---
diff --git a/debian/patches/0005-storagebrowser-ignore-unparseable-volumes.patch b/debian/patches/0005-storagebrowser-ignore-unparseable-volumes.patch
deleted file mode 100644
index 444d261..0000000
--- a/debian/patches/0005-storagebrowser-ignore-unparseable-volumes.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 10 Jan 2012 19:37:09 +0100
-Subject: storagebrowser: ignore unparseable volumes
-
-This e.g. happens when the volume was moved away but the pool didn't get
-refereshed:
-
-Traceback (most recent call last):
- File "/usr/share/virt-manager/virtManager/create.py", line 1229, in browse_import
- self._browse_file(set_path, is_media=False)
- File "/usr/share/virt-manager/virtManager/create.py", line 2118, in _browse_file
- self.storage_browser.show(self.topwin, self.conn)
- File "/usr/share/virt-manager/virtManager/storagebrowse.py", line 74, in show
- self.reset_state(conn)
- File "/usr/share/virt-manager/virtManager/storagebrowse.py", line 183, in reset_state
- self.pool_selected()
- File "/usr/share/virt-manager/virtManager/storagebrowse.py", line 257, in pool_selected
- self.populate_storage_volumes()
- File "/usr/share/virt-manager/virtManager/storagebrowse.py", line 322, in populate_storage_volumes
- path = vol.get_target_path()
- File "/usr/share/virt-manager/virtManager/storagevol.py", line 49, in get_target_path
- return util.xpath(self.get_xml(), "/volume/target/path")
- File "/usr/share/virt-manager/virtManager/libvirtobject.py", line 93, in get_xml
- self.refresh_xml()
- File "/usr/share/virt-manager/virtManager/libvirtobject.py", line 105, in refresh_xml
- self._xml = self._XMLDesc(self._active_xml_flags)
- File "/usr/share/virt-manager/virtManager/storagevol.py", line 35, in _XMLDesc
- return self.vol.XMLDesc(flags)
- File "/usr/lib/python2.7/dist-packages/libvirt.py", line 2002, in XMLDesc
- if ret is None: raise libvirtError ('virStorageVolGetXMLDesc() failed', vol=self)
-libvirt.libvirtError: cannot stat file '/var/scratch/vms/squeeze-template.img': No such file or directory
-
-Instead of failing the whole pool simply ignore the one failing volume.
-Without this patch selecting "Browse..." when creating a new vm from an
-existing disk image won't show the volume dialog if the default pool has
-a missing volume.
----
- src/virtManager/storagebrowse.py | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/virtManager/storagebrowse.py b/src/virtManager/storagebrowse.py
-index 10093ce..108ce43 100644
---- a/src/virtManager/storagebrowse.py
-+++ b/src/virtManager/storagebrowse.py
-@@ -319,8 +319,13 @@ class vmmStorageBrowser(vmmGObjectUI):
- for key in vols.keys():
- vol = vols[key]
- sensitive = True
-- path = vol.get_target_path()
-- fmt = vol.get_format() or ""
-+ try:
-+ path = vol.get_target_path()
-+ fmt = vol.get_format() or ""
-+ except Exception:
-+ logging.exception("Failed to determine volume parameters, "
-+ "skipping volume %s" % key)
-+ continue
- namestr = None
-
- try:
diff --git a/debian/patches/0006-Improve-error-message-if-netcat-can-t-forward-Unix-d.patch b/debian/patches/0006-Improve-error-message-if-netcat-can-t-forward-Unix-d.patch
deleted file mode 100644
index e704ce6..0000000
--- a/debian/patches/0006-Improve-error-message-if-netcat-can-t-forward-Unix-d.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 14 Jan 2012 22:13:44 +0100
-Subject: Improve error message if netcat can't forward Unix domain sockets
-
-Otherwise the information:
-
- End of file while reading data: nc: invalid option -- 'U'
- nc -h for help: Input/output error
-
-is hidden in the error detail. See Debian bug:
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=614291
----
- src/virtManager/manager.py | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py
-index bdbd0af..0560892 100644
---- a/src/virtManager/manager.py
-+++ b/src/virtManager/manager.py
-@@ -18,6 +18,7 @@
- # MA 02110-1301 USA.
- #
-
-+import re
- import gtk
-
- import virtManager.uihelpers as uihelpers
-@@ -653,12 +654,15 @@ class vmmManager(vmmGObjectUI):
- details=details,
- title=_("Virtual Machine Manager Connection Failure"))
- else:
-+ hint = ''
-+ if re.search(r"nc: .* -- 'U'", details):
-+ hint = _("\n - The remote netcat understands the '-U' option")
- self.err.show_err(
- _("Unable to open a connection to the libvirt "
- "management daemon.\n\n" +
- "Libvirt URI is: %s\n\n" % conn.get_uri() +
- "Verify that:\n" +
-- " - The 'libvirtd' daemon has been started\n"),
-+ " - The 'libvirtd' daemon has been started") + hint,
- details=details,
- title=_("Virtual Machine Manager Connection Failure"))
-
diff --git a/debian/patches/0007-console-Fix-hang-when-reconnecting-to-remote-VNC-con.patch b/debian/patches/0007-console-Fix-hang-when-reconnecting-to-remote-VNC-con.patch
deleted file mode 100644
index 4c9ac4f..0000000
--- a/debian/patches/0007-console-Fix-hang-when-reconnecting-to-remote-VNC-con.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Thu, 22 Dec 2011 12:55:40 -0500
-Subject: console: Fix hang when reconnecting to remote VNC console
-
-VNC disconnect signals aren't being delivered, meaning we never cleanup
-up SSH tunnels for remote VNC connections. This causes a reconnect
-attempt to hang, trying to reuse the existing tunnels (which doesn't
-work).
-
-The problem is that we are cleaning up the VNC widget too early,
-unregistering callbacks before they get a chance to be invoked.
-
-Not cleaning up only causes a small memory leak for every console we
-open, so only a minor problem compared to the original issue. A more
-involved fix is required to clean up safely.
----
- src/virtManager/console.py | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/src/virtManager/console.py b/src/virtManager/console.py
-index bd08cc3..a90b260 100644
---- a/src/virtManager/console.py
-+++ b/src/virtManager/console.py
-@@ -844,7 +844,6 @@ class vmmConsolePages(vmmGObjectUI):
- viewport.remove(w)
-
- v.close()
-- v.cleanup()
- self.viewer_connected = False
- self.leave_fullscreen()
-
diff --git a/debian/patches/series b/debian/patches/series
index b33207a..16e90ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
0001-use-usr-share-gconf-for-schema-data.patch
0002-Use-IPy-from-python-ipy.patch
-0003-virt-manager-Fix-Resize-to-VM-menu-option.patch
-0004-console-Fix-crashes-when-deleting-vm-on-F16.patch
-0005-storagebrowser-ignore-unparseable-volumes.patch
-0006-Improve-error-message-if-netcat-can-t-forward-Unix-d.patch
-0007-console-Fix-hang-when-reconnecting-to-remote-VNC-con.patch
--
VirtManager Debian packaging
More information about the Pkg-libvirt-commits
mailing list