rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed traceback with short lpd device URIs (bug #545397).

Browse Source
This commit is contained in:
Tim Waugh 2009-12-08 14:04:31 +00:00
parent bf474bbe59
commit 0f7d526cf9
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
system-config-printer-lpd-uri.patch Normal file
View File

@ -0,0 +1,17 @@
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")

7
system-config-printer.spec
View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.1.15 Version: 1.1.15
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
@ -20,6 +20,7 @@ Patch2: system-config-printer-localize-statereason.patch
Patch3: system-config-printer-browsepoll.patch Patch3: system-config-printer-browsepoll.patch
Patch4: system-config-printer-cupsd.conf-parser.patch Patch4: system-config-printer-cupsd.conf-parser.patch
Patch5: system-config-printer-troubleshooter-traceback.patch Patch5: system-config-printer-troubleshooter-traceback.patch
Patch6: system-config-printer-lpd-uri.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -84,6 +85,7 @@ printers.
%patch3 -p1 -b .browsepoll %patch3 -p1 -b .browsepoll
%patch4 -p1 -b .cupsd.conf-parser %patch4 -p1 -b .cupsd.conf-parser
%patch5 -p1 -b .troubleshooter-traceback %patch5 -p1 -b .troubleshooter-traceback
%patch6 -p1 -b .lpd-uri
%build %build
%configure --with-udev-rules --with-polkit-1 %configure --with-udev-rules --with-polkit-1
@ -196,6 +198,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Tue Dec 8 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-6
- Fixed traceback with short lpd device URIs (bug #545397).
* Mon Dec 7 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-5 * Mon Dec 7 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-5
- Fixed traceback when troubleshooter operation is cancelled (bug #544356). - Fixed traceback when troubleshooter operation is cancelled (bug #544356).