Gentoo Archives: gentoo-commits

From: "Daniel Pielmeier (billie)" <billie@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-print/hplip/files: hplip-3.10.2-plugin.patch
Date: Thu, 27 May 2010 20:25:49
Message-Id: 20100527202546.4CBCF2CE3C@corvid.gentoo.org
1 billie 10/05/27 20:25:46
2
3 Modified: hplip-3.10.2-plugin.patch
4 Log:
5 Use upstream patch to fix bug #274538.
6 (Portage version: 2.1.8.3/cvs/Linux i686)
7
8 Revision Changes Path
9 1.3 net-print/hplip/files/hplip-3.10.2-plugin.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch?r1=1.2&r2=1.3
14
15 Index: hplip-3.10.2-plugin.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/files/hplip-3.10.2-plugin.patch,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- hplip-3.10.2-plugin.patch 4 May 2010 17:52:11 -0000 1.2
22 +++ hplip-3.10.2-plugin.patch 27 May 2010 20:25:46 -0000 1.3
23 @@ -1,11 +1,17 @@
24 ---- installer/core_install.py.old 2010-02-25 00:07:12.000000000 +0100
25 -+++ installer/core_install.py 2010-05-04 19:25:42.268075063 +0200
26 -@@ -1990,7 +1990,7 @@
27 +Index: installer/core_install.py
28 +===================================================================
29 +--- installer/core_install.py (revision 13658)
30 ++++ installer/core_install.py (working copy)
31 +@@ -1990,7 +1990,11 @@
32 if mode == GUI_MODE:
33 return os.system("sh %s --nox11 -- -u" % plugin_file) == 0
34 else:
35 - return os.system("sh %s --nox11 -- -i" % plugin_file) == 0
36 -+ return os.system("sh %s --nox11" % plugin_file) == 0
37 ++ if os.system("sh %s --nox11 -- -i" % plugin_file) == 0:
38 ++ return True
39 ++ else:
40 ++ log.error("Python gobject/dbus may be not installed")
41 ++ return False
42
43
44 def delete_plugin(self):