rpms/system-config-printer/devel clog1, NONE, 1.1 system-config-printer-check-still-connecting.patch, NONE, 1.1 system-config-printer.spec, 1.341, 1.342

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	clog1 system-config-printer-check-still-connecting.patch 
Log Message:
* Mon Jan 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-8
- Fixed traceback when copying printer with certain job options
  set (bug #554268).



--- NEW FILE clog1 ---
* Wed Jan  6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
- Fixed pycups IPPRequest attribute handling bug.

system-config-printer-check-still-connecting.patch:
 monitor.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-check-still-connecting.patch ---
diff -up system-config-printer-1.1.16/monitor.py.check-still-connecting system-config-printer-1.1.16/monitor.py
--- system-config-printer-1.1.16/monitor.py.check-still-connecting	2009-12-22 14:44:19.000000000 +0000
+++ system-config-printer-1.1.16/monitor.py	2010-01-18 16:31:05.664560326 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-## Copyright (C) 2007, 2008, 2009 Tim Waugh <twaugh at redhat.com>
-## Copyright (C) 2007, 2008, 2009 Red Hat, Inc.
+## Copyright (C) 2007, 2008, 2009, 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
@@ -208,7 +208,9 @@ class Monitor:
             self.connecting_timers[printer] = timer
             return False
 
-        del self.connecting_timers[printer]
+        if self.connecting_timers.has_key (printer):
+            del self.connecting_timers[printer]
+
         debugprint ("Still-connecting timer fired for `%s'" % printer)
         (printer_jobs, my_printers) = self.sort_jobs_by_printer ()
         self.update_connecting_devices (printer_jobs)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -p -r1.341 -r1.342
--- system-config-printer.spec	12 Jan 2010 16:31:59 -0000	1.341
+++ system-config-printer.spec	18 Jan 2010 16:39:07 -0000	1.342
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -26,6 +26,7 @@ Patch8: system-config-printer-select-non
 Patch9: system-config-printer-ink-levels.patch
 Patch10: system-config-printer-auth-no-pw.patch
 Patch11: system-config-printer-copy-crash.patch
+Patch12: system-config-printer-check-still-connecting.patch
 
 Patch101: pycups-request-readio.patch
 
@@ -98,6 +99,7 @@ printers.
 %patch9 -p1 -b .ink-levels
 %patch10 -p1 -b .auth-no-pw
 %patch11 -p1 -b .copy-crash
+%patch12 -p1 -b .check-still-connecting
 
 pushd pycups-%{pycups_version}
 %patch101 -p1 -b .request-readio
@@ -218,6 +220,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Jan 18 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-9
+- Avoid traceback when checking on connecting backends (bug #555552).
+
 * Mon Jan 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-8
 - Fixed traceback when copying printer with certain job options
   set (bug #554268).