rpms/system-config-printer/F-7 system-config-printer-reconnect.patch, NONE, 1.1 .cvsignore, 1.141, 1.142 sources, 1.147, 1.148 system-config-printer.spec, 1.121, 1.122

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5688

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-reconnect.patch 
Log Message:
* Wed Jan 23 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.9-2
- Applied patch from upstream to use a better reconnection method, to avoid
  'Local authentication certificate not found' messages.
- Updated to pycups-1.9.33.


system-config-printer-reconnect.patch:

--- NEW FILE system-config-printer-reconnect.patch ---
diff -U0 system-config-printer-0.7.74.9/ChangeLog.reconnect system-config-printer-0.7.74.9/ChangeLog
--- system-config-printer-0.7.74.9/ChangeLog.reconnect	2008-01-16 17:25:26.000000000 +0000
+++ system-config-printer-0.7.74.9/ChangeLog	2008-01-18 11:55:40.000000000 +0000
@@ -0,0 +1,7 @@
+2008-01-18  Tim Waugh  <twaugh at redhat.com>
+
+	* system-config-printer.py (GUI.reconnect): Better reconnection
+	method.
+	(GUI.save_serversettings): Really refresh server settings after
+	applying changes.
+
diff -up system-config-printer-0.7.74.9/system-config-printer.py.reconnect system-config-printer-0.7.74.9/system-config-printer.py
--- system-config-printer-0.7.74.9/system-config-printer.py.reconnect	2008-01-16 17:25:26.000000000 +0000
+++ system-config-printer-0.7.74.9/system-config-printer.py	2008-01-18 11:55:40.000000000 +0000
@@ -915,17 +915,30 @@ class GUI:
 
     def reconnect (self):
         """Reconnect to CUPS after the server has reloaded."""
-        # libcups will handle the reconnection; we just need to tell it
-        # to do something.
-        try:
-            self.cups.getClasses ()
-        except cups.IPPError, (e, s):
-            self.show_IPP_Error(e, s)
-        except cups.HTTPError, (s,):
-            self.cups = None
-            self.setConnected()
-            self.populateList()
-            self.show_HTTP_Error(s)
+        # libcups would handle the reconnection if we just told it to
+        # do something, for example fetching a list of classes.
+        # However, our local authentication certificate would be
+        # invalidated by a server restart, so it is better for us to
+        # handle the reconnection ourselves.
+
+        # Disconnect.
+        self.cups = None
+        self.setConnected()
+
+        cups.setServer(self.connect_server)
+        cups.setUser(self.connect_user)
+        attempt = 1
+        while attempt <= 5:
+            try:
+                self.cups = cups.Connection ()
+                break
+            except RuntimeError:
+                # Connection failed.
+                time.sleep(1)
+                attempt += 1
+
+        self.setConnected()
+        self.passwd_retry = False
 
     def on_btnCancelConnect_clicked(self, widget):
         """Close Connect dialog"""
@@ -2083,7 +2096,7 @@ class GUI:
         # Refresh the server settings in case they have changed in the
         # mean time.
         try:
-            self.server_settings = self.cups.adminGetServerSettings()
+            self.fillServerTab()
         except:
             nonfatalException()
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/.cvsignore,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- .cvsignore	16 Jan 2008 17:44:51 -0000	1.141
+++ .cvsignore	23 Jan 2008 13:47:35 -0000	1.142
@@ -123,3 +123,4 @@
 pycups-1.9.32.tar.bz2
 system-config-printer-0.7.74.8.tar.bz2
 system-config-printer-0.7.74.9.tar.bz2
+pycups-1.9.33.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- sources	16 Jan 2008 17:44:51 -0000	1.147
+++ sources	23 Jan 2008 13:47:35 -0000	1.148
@@ -1,2 +1,2 @@
-c88b387b233a0aca280c9d02c4e63a44  pycups-1.9.32.tar.bz2
 ac0b2075aab72298ea332ab9f067c858  system-config-printer-0.7.74.9.tar.bz2
+f976bcb6669118d0b87662901a91f996  pycups-1.9.33.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-7/system-config-printer.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- system-config-printer.spec	16 Jan 2008 17:44:51 -0000	1.121
+++ system-config-printer.spec	23 Jan 2008 13:47:35 -0000	1.122
@@ -1,9 +1,9 @@
-%define pycups_version 1.9.32
+%define pycups_version 1.9.33
 
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.74.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -11,6 +11,7 @@
 Source1: pycups-%{pycups_version}.tar.bz2
 Source2: system-config-printer.pam
 Source3: system-config-printer.console
+Patch0: system-config-printer-reconnect.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -53,6 +54,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p1 -b .reconnect
 
 %build
 %configure
@@ -135,6 +137,11 @@
 exit 0
 
 %changelog
+* Wed Jan 23 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.9-2
+- Applied patch from upstream to use a better reconnection method, to avoid
+  'Local authentication certificate not found' messages.
+- Updated to pycups-1.9.33.
+
 * Wed Jan 16 2008 Tim Waugh <twaugh at redhat.com> 0.7.74.9-1
 - 0.7.74.9:
   - Set data button state when there is no CUPS connection.