Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12242
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-lpd-uri.patch
Log Message:
* Tue Dec 8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
- Fixed traceback with short lpd device URIs (bug #545397).
system-config-printer-lpd-uri.patch:
system-config-printer.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE system-config-printer-lpd-uri.patch ---
diff -up system-config-printer-1.1.15/system-config-printer.py.lpd-uri system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.lpd-uri 2009-12-08 14:00:31.646480878 +0000
+++ system-config-printer-1.1.15/system-config-printer.py 2009-12-08 14:00:35.027606138 +0000
@@ -5767,10 +5767,10 @@ class NewPrinterGUI(GtkGUI):
(scheme, rest) = urllib.splittype (device.uri)
(hostport, rest) = urllib.splithost (rest)
(queue, rest) = urllib.splitquery (rest)
- if queue[0] == '/':
- queue = queue[1:]
-
if queue != '':
+ if queue[0] == '/':
+ queue = queue[1:]
+
device.menuentry = _("LPD/LPR queue '%s'") % queue
else:
device.menuentry = _("LPD/LPR queue")
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- system-config-printer.spec 7 Dec 2009 17:37:52 -0000 1.323
+++ system-config-printer.spec 8 Dec 2009 14:03:59 -0000 1.324
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.1.15
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -20,6 +20,7 @@ Patch2: system-config-printer-localize-s
Patch3: system-config-printer-browsepoll.patch
Patch4: system-config-printer-cupsd.conf-parser.patch
Patch5: system-config-printer-troubleshooter-traceback.patch
+Patch6: system-config-printer-lpd-uri.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -84,6 +85,7 @@ printers.
%patch3 -p1 -b .browsepoll
%patch4 -p1 -b .cupsd.conf-parser
%patch5 -p1 -b .troubleshooter-traceback
+%patch6 -p1 -b .lpd-uri
%build
%configure --with-udev-rules --with-polkit-1
@@ -196,6 +198,9 @@ rm -rf %buildroot
exit 0
%changelog
+* Tue Dec 8 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-6
+- Fixed traceback with short lpd device URIs (bug #545397).
+
* Mon Dec 7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-5
- Fixed traceback when troubleshooter operation is cancelled (bug #544356).