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

- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).

Browse Source
This commit is contained in:
Tim Waugh 2009-12-03 17:20:06 +00:00
parent f71e4c6351
commit a3439afa2f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
system-config-printer-cupsd.conf-parser.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser system-config-printer-1.1.15/AdvancedServerSettings.py
--- system-config-printer-1.1.15/AdvancedServerSettings.py.cupsd.conf-parser 2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.15/AdvancedServerSettings.py 2009-12-03 17:18:29.015925153 +0000
@@ -154,7 +154,7 @@ class AdvancedServerSettingsDialog:
self.browse_poll = []
f.seek (0)
for line in f.readlines ():
- l = line.lower ()
+ l = line.lower ().strip ()
if l.startswith ("preservejobhistory "):
try:
preserve_job_history = parse_yesno (l)

3
system-config-printer.spec
View File

@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
Patch1: system-config-printer-no-epydoc.patch
Patch2: system-config-printer-localize-statereason.patch
Patch3: system-config-printer-browsepoll.patch
Patch4: system-config-printer-cupsd.conf-parser.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@ -80,6 +81,7 @@ printers.
%patch1 -p1 -b .no-epydoc
%patch2 -p1 -b .localize-statereason
%patch3 -p1 -b .browsepoll
%patch4 -p1 -b .cupsd.conf-parser
%build
%configure --with-udev-rules --with-polkit-1
@ -193,6 +195,7 @@ exit 0
%changelog
* Thu Dec 3 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-3
- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).
- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
* Thu Dec 3 2009 Tim Waugh <twaugh@redhat.com> - 1.1.15-2