packages: virt-manager/virt-manager.spec, virt-manager/virt-manager-dead-co...

[baggins]

Author: baggins                      Date: Sun Feb 19 23:20:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- added patch removing dead code that caused misleading "variable 'details'
  referenced before assignment" errors which hid the real error message

---- Files affected:
packages/virt-manager:
   virt-manager.spec (1.23 -> 1.24) , virt-manager-dead-code.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/virt-manager/virt-manager.spec
diff -u packages/virt-manager/virt-manager.spec:1.23 packages/virt-manager/virt-manager.spec:1.24
--- packages/virt-manager/virt-manager.spec:1.23	Sat Feb 18 19:11:01 2012
+++ packages/virt-manager/virt-manager.spec	Mon Feb 20 00:20:20 2012
@@ -4,11 +4,12 @@
 Summary:	Virtual Machine Manager
 Name:		virt-manager
 Version:	0.9.1
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Applications/Emulators
 Source0:	http://virt-manager.org/download/sources/virt-manager/%{name}-%{version}.tar.gz
 # Source0-md5:	cfee07b277e315b16d5180cfab5f8307
+Patch0:		%{name}-dead-code.patch
 URL:		http://virt-manager.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -54,6 +55,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e 's|PWD|shell pwd|g' icons/hicolor/*/Makefile.am
 
@@ -129,6 +131,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2012/02/19 23:20:20  baggins
+- rel 3
+- added patch removing dead code that caused misleading "variable 'details'
+  referenced before assignment" errors which hid the real error message
+
 Revision 1.23  2012/02/18 18:11:01  baggins
 - rel 2
 - virtinst >= 0.600.1 is required

================================================================
Index: packages/virt-manager/virt-manager-dead-code.patch
diff -u /dev/null packages/virt-manager/virt-manager-dead-code.patch:1.1
--- /dev/null	Mon Feb 20 00:20:26 2012
+++ packages/virt-manager/virt-manager-dead-code.patch	Mon Feb 20 00:20:20 2012
@@ -0,0 +1,23 @@
+--- virt-manager-0.9.1/src/virtManager/manager.py~	2012-02-01 00:14:18.000000000 +0100
++++ virt-manager-0.9.1/src/virtManager/manager.py	2012-02-20 00:17:05.028801540 +0100
+@@ -661,11 +661,6 @@
+             details = "%s\n\n%s" % (msg, tb)
+ 
+         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"
+@@ -674,8 +669,6 @@
+             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) +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/virt-manager/virt-manager.spec?r1=1.23&r2=1.24&f=u