[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, master, updated. debian/0.9.1-4-6-g7e490ef
Laurent Léonard
laurent at open-minds.org
Sat Jul 14 17:20:07 UTC 2012
The following commit has been merged in the master branch:
commit a2c30a867ccdc156777d97612c41d6e05c133f4e
Author: Laurent Léonard <laurent at open-minds.org>
Date: Sat Jul 14 19:03:28 2012 +0200
Drop patches
0003-manager-Fix-error-reporting-when-can-t-connect-remot.patch - fixed upstream http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=54d007b2875a887b1579604e45b122dde286b9be
0004-vnc-Fix-accidental-recursion-we-reporting-grab-keys.patch - fixed upstream http://git.fedorahosted.org/git/?p=virt-manager.git;a=commitdiff;h=c47fc5454039a9e7093f179c1e06ffc576dc1ad3
diff --git a/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch b/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
index 5382cc8..380a9bb 100644
--- a/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
+++ b/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
@@ -8,7 +8,7 @@ Subject: use /usr/share/gconf for schema data
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 9fa9fed..f03dba0 100644
+index e51d7b2..c4a4ad5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ dbusdir = $(datadir)/dbus-1/services
@@ -21,10 +21,10 @@ index 9fa9fed..f03dba0 100644
schema_DATA = $(PACKAGE).schemas
diff --git a/src/Makefile.in b/src/Makefile.in
-index c64d781..df4e900 100644
+index f3d53be..3c83244 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -261,7 +261,7 @@ desktop_DATA = $(PACKAGE).desktop
+@@ -272,7 +272,7 @@ desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services
dbus_DATA_IN = $(PACKAGE).service.in
dbus_DATA = $(PACKAGE).service
@@ -33,4 +33,3 @@ index c64d781..df4e900 100644
schema_DATA_IN = $(PACKAGE).schemas.in
schema_DATA = $(PACKAGE).schemas
CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_DATA) $(libexec_SCRIPTS) $(schema_DATA) $(PACKAGE).desktop.in
---
diff --git a/debian/patches/0002-Use-IPy-from-python-ipy.patch b/debian/patches/0002-Use-IPy-from-python-ipy.patch
index 5399a29..6894df5 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 2632b73..6ddab4d 100644
+index 23f23de..a92c630 100644
--- a/src/virtManager/createnet.py
+++ b/src/virtManager/createnet.py
@@ -23,7 +23,7 @@ import re
@@ -23,7 +23,7 @@ index 2632b73..6ddab4d 100644
from virtManager.baseclass import vmmGObjectUI
diff --git a/src/virtManager/network.py b/src/virtManager/network.py
-index aa918b8..fad31c9 100644
+index ae89955..644cb21 100644
--- a/src/virtManager/network.py
+++ b/src/virtManager/network.py
@@ -19,7 +19,7 @@
@@ -35,4 +35,3 @@ index aa918b8..fad31c9 100644
from virtManager.libvirtobject import vmmLibvirtObject
class vmmNetwork(vmmLibvirtObject):
---
diff --git a/debian/patches/0003-manager-Fix-error-reporting-when-can-t-connect-remot.patch b/debian/patches/0003-manager-Fix-error-reporting-when-can-t-connect-remot.patch
deleted file mode 100644
index 3932615..0000000
--- a/debian/patches/0003-manager-Fix-error-reporting-when-can-t-connect-remot.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Thu, 2 Feb 2012 16:45:18 -0500
-Subject: manager: Fix error reporting when can't connect remotely
-
-Also rejigger the error building again to be more useful and
-less scary in cases where we are pretty confident we know what the
-problem is.
----
- src/virtManager/manager.py | 75 +++++++++++++++++++++++++------------------
- 1 files changed, 44 insertions(+), 31 deletions(-)
-
-diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py
-index 9d2be6e..c32556c 100644
---- a/src/virtManager/manager.py
-+++ b/src/virtManager/manager.py
-@@ -648,42 +648,55 @@ class vmmManager(vmmGObjectUI):
- conn.open()
- return True
-
-- def _connect_error(self, conn, shortmsg, tb, warnconsole):
-- shortmsg = shortmsg.strip(" \n")
-+ def _connect_error(self, conn, errmsg, tb, warnconsole):
-+ errmsg = errmsg.strip(" \n")
- tb = tb.strip(" \n")
-- msg = _("Unable to connect to libvirt:\n\n%s\n\n") % shortmsg
-+ hint = ""
-+ show_errmsg = True
-+
-+ if conn.is_remote():
-+ logging.debug(conn.get_transport())
-+ if re.search(r"nc: .* -- 'U'", tb):
-+ hint += _("The remote host requires a version of netcat/nc\n"
-+ "which supports the -U option.")
-+ show_errmsg = False
-+ elif conn.get_transport()[0] == "ssh" and re.search(r"ssh-askpass", tb):
-+ hint += _("You need to install openssh-askpass or similar\n"
-+ "to connect to this host.")
-+ show_errmsg = False
-+ else:
-+ hint += _("Verify that the 'libvirtd' daemon is running\n"
-+ "on the remote host.")
-
-- if conn.is_xen() and not conn.is_remote():
-- msg += _("Verify that:\n"
-- " - A Xen host kernel was booted\n"
-- " - The Xen service has been started\n")
-- msg = msg.strip("\n")
-- details = "%s\n\n%s" % (msg, tb)
-+ elif conn.is_xen():
-+ hint += _("Verify that:\n"
-+ " - A Xen host kernel was booted\n"
-+ " - The Xen service has been started")
-
- else:
-- hints = []
-- if conn.is_remote() and re.search(r"nc: .* -- 'U'", details):
-- hints.append(
-- _("\n - The remote netcat understands the '-U' option"))
--
- if warnconsole:
-- msg += _("Could not detect a local session: if you are \n"
-- "running virt-manager over ssh -X or VNC, you \n"
-- "may not be able to connect to libvirt as a \n"
-- "regular user. Try running as root.\n\n")
-- else:
-- msg += _("Verify that:\n" +
-- " - The 'libvirtd' daemon has been started")
-- for hint in hints:
-- msg += hint
--
-- msg = msg.strip("\n")
-- details = (("%s\n\n" % msg) +
-- (_("Libvirt URI is: %s\n\n") % conn.get_uri()) +
-- tb)
--
-- self.err.show_err(msg, details,
-- title=_("Virtual Machine Manager Connection Failure"))
-+ hint += _("Could not detect a local session: if you are \n"
-+ "running virt-manager over ssh -X or VNC, you \n"
-+ "may not be able to connect to libvirt as a \n"
-+ "regular user. Try running as root.")
-+ show_errmsg = False
-+ elif re.search(r"libvirt-sock", tb):
-+ hint += _("Verify that the 'libvirtd' daemon is running.")
-+ show_errmsg = False
-+
-+ msg = _("Unable to connect to libvirt.")
-+ if show_errmsg:
-+ msg += "\n\n%s" % errmsg
-+ if hint:
-+ msg += "\n\n%s" % hint
-+
-+ msg = msg.strip("\n")
-+ details = msg
-+ details += "\n\n"
-+ details += "Libvirt URI is: %s\n\n" % conn.get_uri()
-+ details += tb
-+
-+ self.err.show_err(msg, details, title=_("Virtual Machine Manager Connection Failure"))
-
-
- ####################################
diff --git a/debian/patches/0004-vnc-Fix-accidental-recursion-we-reporting-grab-keys.patch b/debian/patches/0004-vnc-Fix-accidental-recursion-we-reporting-grab-keys.patch
deleted file mode 100644
index b955aa6..0000000
--- a/debian/patches/0004-vnc-Fix-accidental-recursion-we-reporting-grab-keys.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Mon, 6 Feb 2012 17:57:14 -0500
-Subject: vnc: Fix accidental recursion we reporting grab keys
-
----
- src/virtManager/console.py | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/virtManager/console.py b/src/virtManager/console.py
-index c00011e..3c40c6b 100644
---- a/src/virtManager/console.py
-+++ b/src/virtManager/console.py
-@@ -390,12 +390,6 @@ class VNCViewer(Viewer):
- def open_fd(self, fd):
- self.display.open_fd(fd)
-
-- def get_grab_keys(self):
-- keystr = self.get_grab_keys()
-- if not keystr:
-- keystr = "Control_L+Alt_L"
-- return keystr
--
- def set_credential_username(self, cred):
- self.display.set_credential(gtkvnc.CREDENTIAL_USERNAME, cred)
-
diff --git a/debian/patches/series b/debian/patches/series
index 975a649..16e90ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
0001-use-usr-share-gconf-for-schema-data.patch
0002-Use-IPy-from-python-ipy.patch
-0003-manager-Fix-error-reporting-when-can-t-connect-remot.patch
-0004-vnc-Fix-accidental-recursion-we-reporting-grab-keys.patch
--
VirtManager Debian packaging
More information about the Pkg-libvirt-commits
mailing list