rpms/system-config-printer/devel system-config-printer-cupsd.conf-parser.patch, NONE, 1.1 system-config-printer.spec, 1.316, 1.317

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3338

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-cupsd.conf-parser.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).


system-config-printer-cupsd.conf-parser.patch:
 AdvancedServerSettings.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-cupsd.conf-parser.patch ---
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)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- system-config-printer.spec	3 Dec 2009 17:12:43 -0000	1.316
+++ system-config-printer.spec	3 Dec 2009 17:20:06 -0000	1.317
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
 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 at 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 at redhat.com> - 1.1.15-2