rpms/system-config-printer/F-11 system-config-printer-cupsd.conf-parser.patch, NONE, 1.1 system-config-printer.spec, 1.310, 1.311

[Tim Waugh]

Author: twaugh

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

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/F-11/system-config-printer.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -p -r1.310 -r1.311
--- system-config-printer.spec	3 Dec 2009 17:14:51 -0000	1.310
+++ system-config-printer.spec	3 Dec 2009 17:21:46 -0000	1.311
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-localize-statereason.patch
 Patch2: system-config-printer-browsepoll.patch
+Patch3: system-config-printer-cupsd.conf-parser.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -67,6 +68,7 @@ the configuration tool.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .localize-statereason
 %patch2 -p1 -b .browsepoll
+%patch3 -p1 -b .cupsd.conf-parser
 
 %build
 %configure
@@ -170,6 +172,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