diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2010-05-27 20:25:46 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2010-05-27 20:25:46 +0000 |
| commit | 90c6e6b04c20aa29b5fa2f3d68258ef0bce3aa55 (patch) | |
| tree | 918a7a6c6080838bfc4f3816c8abcdac74d48ac0 /net-print | |
| parent | Add myself as maintainer, metadata clean up. (diff) | |
| download | gentoo-2-90c6e6b04c20aa29b5fa2f3d68258ef0bce3aa55.tar.gz gentoo-2-90c6e6b04c20aa29b5fa2f3d68258ef0bce3aa55.tar.bz2 gentoo-2-90c6e6b04c20aa29b5fa2f3d68258ef0bce3aa55.zip | |
Use upstream patch to fix bug #274538.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/hplip/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/hplip/files/hplip-3.10.2-plugin.patch | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index eb5525695cc0..7d2e61d53fb1 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/hplip # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.161 2010/05/19 21:21:00 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.162 2010/05/27 20:25:45 billie Exp $ + + 27 May 2010; Daniel Pielmeier <billie@gentoo.org> + files/hplip-3.10.2-plugin.patch: + Use upstream patch to fix bug #274538. 19 May 2010; Daniel Pielmeier <billie@gentoo.org> files/hplip-3.10.5-udev-attrs.patch: diff --git a/net-print/hplip/files/hplip-3.10.2-plugin.patch b/net-print/hplip/files/hplip-3.10.2-plugin.patch index c59c5a8d4b4f..4f0a5b6a5cc3 100644 --- a/net-print/hplip/files/hplip-3.10.2-plugin.patch +++ b/net-print/hplip/files/hplip-3.10.2-plugin.patch @@ -1,11 +1,17 @@ ---- installer/core_install.py.old 2010-02-25 00:07:12.000000000 +0100 -+++ installer/core_install.py 2010-05-04 19:25:42.268075063 +0200 -@@ -1990,7 +1990,7 @@ +Index: installer/core_install.py
+===================================================================
+--- installer/core_install.py (revision 13658)
++++ installer/core_install.py (working copy)
+@@ -1990,7 +1990,11 @@
if mode == GUI_MODE:
return os.system("sh %s --nox11 -- -u" % plugin_file) == 0
else:
- return os.system("sh %s --nox11 -- -i" % plugin_file) == 0
-+ return os.system("sh %s --nox11" % plugin_file) == 0
++ if os.system("sh %s --nox11 -- -i" % plugin_file) == 0:
++ return True
++ else:
++ log.error("Python gobject/dbus may be not installed")
++ return False
def delete_plugin(self):
|