diff options
Diffstat (limited to 'print/system-config-printer/files')
| -rw-r--r-- | print/system-config-printer/files/patch-cupshelpers_cupshelpers.py (renamed from print/system-config-printer/files/patch-cupshelpers.py) | 18 | ||||
| -rw-r--r-- | print/system-config-printer/files/patch-system-config-printer.py | 34 | ||||
| -rw-r--r-- | print/system-config-printer/files/patch-troubleshoot_CheckUSBPermissions.py | 11 |
3 files changed, 37 insertions, 26 deletions
diff --git a/print/system-config-printer/files/patch-cupshelpers.py b/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py index b1b006330a8d..53e62fba18ff 100644 --- a/print/system-config-printer/files/patch-cupshelpers.py +++ b/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py @@ -1,15 +1,15 @@ ---- cupshelpers.py.orig 2008-03-20 11:49:54.000000000 -0400 -+++ cupshelpers.py 2008-03-20 11:51:06.000000000 -0400 -@@ -19,7 +19,7 @@ - ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +--- cupshelpers/cupshelpers.py.orig 2008-07-09 06:23:44.000000000 -0500 ++++ cupshelpers/cupshelpers.py 2008-07-26 13:33:50.596144479 -0500 +@@ -20,7 +20,7 @@ import cups, pprint, os, tempfile, re --from rhpl.translate import _, N_ -+from gettext import gettext as _ import locale +-from . import _debugprint ++# from . import _debugprint - def debugprint(x): -@@ -456,7 +456,7 @@ + class Printer: + _flags_blacklist = ["options", "local"] +@@ -699,7 +699,7 @@ # First, a local function. How to check that something exists # in a path: @@ -18,7 +18,7 @@ # Strip out foomatic '%'-style place-holders. p = name.find ('%') if p != -1: -@@ -551,7 +551,7 @@ +@@ -794,7 +794,7 @@ continue exepath = pathcheck (exe, diff --git a/print/system-config-printer/files/patch-system-config-printer.py b/print/system-config-printer/files/patch-system-config-printer.py index 0c545351c11e..2d8528a7b4f3 100644 --- a/print/system-config-printer/files/patch-system-config-printer.py +++ b/print/system-config-printer/files/patch-system-config-printer.py @@ -1,24 +1,24 @@ ---- system-config-printer.py.orig 2008-05-23 04:57:31.000000000 -0700 -+++ system-config-printer.py 2008-05-26 23:25:11.159502896 -0700 -@@ -3098,7 +3098,7 @@ +--- system-config-printer.py.orig 2008-07-10 10:31:58.000000000 -0500 ++++ system-config-printer.py 2008-07-26 13:26:03.412705522 -0500 +@@ -3389,7 +3389,7 @@ # Try to get make and model via SNMP if host: os.environ["HOST"] = host -- cmd = '/usr/lib/cups/backend/snmp "${HOST}" 2>/dev/null' -+ cmd = '%%LOCALBASE%%/libexec/cups/backend/snmp "${HOST}" 2>/dev/null' +- cmd = '/usr/lib/cups/backend/snmp "${HOST}"' ++ cmd = '%%LOCALBASE%%/lib/cups/backend/snmp "${HOST}"' debugprint (host + ": " + cmd) - p = os.popen(cmd, 'r') - output = p.read ().strip () -@@ -4370,7 +4370,7 @@ - os.environ["PPD"] = filename - # We want this to be in the current natural language, - # so we intentionally don't set LC_ALL=C here. -- p = os.popen ('/usr/bin/cupstestppd -rvv "$PPD"', 'r') -+ p = os.popen ('%%LOCALBASE%%/bin/cupstestppd -rvv "$PPD"', 'r') - output = p.readlines () - p.close () - err += reduce (lambda x, y: x + y, output) -@@ -4655,7 +4655,7 @@ + stdout = None + try: +@@ -4693,7 +4693,7 @@ + try: + # We want this to be in the current natural language, + # so we intentionally don't set LC_ALL=C here. +- p = subprocess.Popen (['/usr/bin/cupstestppd', ++ p = subprocess.Popen (['%%LOCALBASE%%/bin/cupstestppd', + '-rvv', filename], + stdin=file("/dev/null"), + stdout=subprocess.PIPE, +@@ -4984,7 +4984,7 @@ (pkgs, exes) = cupshelpers.missingPackagesAndExecutables (ppd) if len (pkgs) > 0 or len (exes) > 0: # We didn't find a necessary executable. Complain. diff --git a/print/system-config-printer/files/patch-troubleshoot_CheckUSBPermissions.py b/print/system-config-printer/files/patch-troubleshoot_CheckUSBPermissions.py new file mode 100644 index 000000000000..8fc60a7609eb --- /dev/null +++ b/print/system-config-printer/files/patch-troubleshoot_CheckUSBPermissions.py @@ -0,0 +1,11 @@ +--- troubleshoot/CheckUSBPermissions.py.orig 2008-07-26 13:36:20.440361271 -0500 ++++ troubleshoot/CheckUSBPermissions.py 2008-07-26 13:36:36.255172372 -0500 +@@ -51,7 +51,7 @@ + if not os.access (LSUSB, os.X_OK): + return False + +- GETFACL = "/usr/bin/getfacl" ++ GETFACL = "/bin/getfacl" + if not os.access (GETFACL, os.X_OK): + return False + |