rpms/system-config-printer/F-11 system-config-printer-userdefault-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.334, 1.335

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-userdefault-traceback.patch 
Log Message:
* Mon Jan 18 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-9
- Handle errors more gracefully in userdefault.py (bug #556345).


system-config-printer-userdefault-traceback.patch:
 userdefault.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-userdefault-traceback.patch ---
diff -up system-config-printer-1.1.16/userdefault.py.userdefault-traceback system-config-printer-1.1.16/userdefault.py
--- system-config-printer-1.1.16/userdefault.py.userdefault-traceback	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.16/userdefault.py	2010-01-18 16:58:17.502559206 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
-## Copyright (C) 2007, 2008 Tim Waugh <twaugh at redhat.com>
+## Copyright (C) 2006, 2007, 2008, 2010 Red Hat, Inc.
+## Author: Tim Waugh <twaugh at redhat.com>
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -161,7 +161,11 @@ class UserDefaultPrompt:
                 self.userdef.clear ()
             self.set_default_fn (self.name)
         else:
-            self.userdef.set (self.name)
+            try:
+                self.userdef.set (self.name)
+            except Exception, e:
+                print "Error setting default: %s" % repr (e)
+
             self.refresh_fn ()
 
         dialog.destroy ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -p -r1.334 -r1.335
--- system-config-printer.spec	18 Jan 2010 16:57:54 -0000	1.334
+++ system-config-printer.spec	18 Jan 2010 17:02:08 -0000	1.335
@@ -27,6 +27,7 @@ Patch9: system-config-printer-auth-no-pw
 Patch10: system-config-printer-copy-crash.patch
 Patch11: system-config-printer-check-still-connecting.patch
 Patch12: system-config-printer-async-fallback.patch
+Patch13: system-config-printer-userdefault-traceback.patch
 
 Patch101: pycups-request-readio.patch
 
@@ -89,6 +90,7 @@ the configuration tool.
 %patch10 -p1 -b .copy-crash
 %patch11 -p1 -b .check-still-connecting
 %patch12 -p1 -b .async-fallback
+%patch13 -p1 -b .userdefault-traceback
 
 pushd pycups-%{pycups_version}
 %patch101 -p1 -b .request-readio
@@ -200,6 +202,7 @@ exit 0
 
 %changelog
 * Mon Jan 18 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-9
+- Handle errors more gracefully in userdefault.py (bug #556345).
 - Don't rely on cups-pk-helper being around (bug #556170).
 - Avoid traceback when checking on connecting backends (bug #555552).