bce4031890
- Fixed reconnection error handling in IPPAuthOperation class (bug #575198).
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
diff -up system-config-printer-1.2.0/asyncipp.py.reconnect-error system-config-printer-1.2.0/asyncipp.py
|
|
--- system-config-printer-1.2.0/asyncipp.py.reconnect-error 2010-01-27 11:17:44.000000000 +0000
|
|
+++ system-config-printer-1.2.0/asyncipp.py 2010-03-22 11:54:54.320452998 +0000
|
|
@@ -1,6 +1,6 @@
|
|
#!/usr/bin/env python
|
|
|
|
-## Copyright (C) 2007, 2008, 2009 Red Hat, Inc.
|
|
+## Copyright (C) 2007, 2008, 2009, 2010 Red Hat, Inc.
|
|
## Copyright (C) 2008 Novell, Inc.
|
|
## Author: Tim Waugh <twaugh@redhat.com>
|
|
|
|
@@ -333,7 +333,7 @@ class _IPPAuthOperation:
|
|
# This is the initial "connection" operation, or a
|
|
# subsequent reconnection attempt.
|
|
debugprint ("Connection/reconnection failed")
|
|
- return self._reconnect_error (exc)
|
|
+ return self._reconnect_error (conn, exc)
|
|
|
|
if self._cancel:
|
|
return self._error (exc)
|
|
@@ -353,7 +353,7 @@ class _IPPAuthOperation:
|
|
e == cups.IPP_FORBIDDEN):
|
|
forbidden = (e == cups.IPP_FORBIDDEN)
|
|
elif e == cups.IPP_SERVICE_UNAVAILABLE:
|
|
- return self._reconnect_error (exc)
|
|
+ return self._reconnect_error (conn, exc)
|
|
else:
|
|
return self._error (exc)
|
|
elif type (exc) == cups.HTTPError:
|