rpms/system-config-printer/F-11 system-config-printer-raw-statereason.patch, NONE, 1.1 system-config-printer.spec, 1.340, 1.341

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-raw-statereason.patch 
Log Message:
* Sun Jan 24 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-12
- Fixed statereason localization for raw queues (bug #558156).


system-config-printer-raw-statereason.patch:
 statereason.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-raw-statereason.patch ---
diff -up system-config-printer-1.1.16/statereason.py.raw-statereason system-config-printer-1.1.16/statereason.py
--- system-config-printer-1.1.16/statereason.py.raw-statereason	2010-01-24 11:39:59.564183236 +0000
+++ system-config-printer-1.1.16/statereason.py	2010-01-24 11:40:09.827308551 +0000
@@ -137,6 +137,7 @@ class StateReason:
                 except (cups.IPPError, OSError):
                     pass
 
+            reason = self.get_reason ()
             if self._ppd:
                 try:
                     schemes = ["text", "http", "help", "file"]
@@ -148,10 +149,8 @@ class StateReason:
                             localized_reason = localized_reason + reason + ", "
                     if localized_reason != "":
                         reason = localized_reason[:-2]
-                    else:
-                        reason = self.get_reason()
                 except RuntimeError:
-                    reason = self.get_reason()
+                    pass
 
             text = _("Printer '%s': '%s'.") % (self.get_printer (), reason)
         return (title, text)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- system-config-printer.spec	24 Jan 2010 11:11:08 -0000	1.340
+++ system-config-printer.spec	24 Jan 2010 11:56:10 -0000	1.341
@@ -32,6 +32,7 @@ Patch14: system-config-printer-serial-wi
 Patch15: system-config-printer-statereason-tmp.patch
 Patch16: system-config-printer-asyncpk0-fallback.patch
 Patch17: system-config-printer-async-fallback-2.patch
+Patch18: system-config-printer-raw-statereason.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -97,6 +98,7 @@ the configuration tool.
 %patch15 -p1 -b .statereason-tmp
 %patch16 -p1 -b .asyncpk0-fallback
 %patch17 -p1 -b .async-fallback-2
+%patch18 -p1 -b .raw-statereason
 
 %build
 %configure
@@ -204,6 +206,7 @@ exit 0
 
 %changelog
 * Sun Jan 24 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-12
+- Fixed statereason localization for raw queues (bug #558156).
 - Fixed async fallback again (bug #557854).
 
 * Fri Jan 22 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-11