From 3247cad9234b3fbc124f9efea35d748c2ddedb29 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mar 22 2010 13:00:39 +0000
Subject: - Fixed reconnection error handling in IPPAuthOperation class (bug

    #575198).

---

diff --git a/system-config-printer-reconnect-error.patch b/system-config-printer-reconnect-error.patch
new file mode 100644
index 0000000..005feb8
--- /dev/null
+++ b/system-config-printer-reconnect-error.patch
@@ -0,0 +1,29 @@
+diff -up system-config-printer-1.1.18/asyncipp.py.reconnect-error system-config-printer-1.1.18/asyncipp.py
+--- system-config-printer-1.1.18/asyncipp.py.reconnect-error	2010-01-27 11:17:44.000000000 +0000
++++ system-config-printer-1.1.18/asyncipp.py	2010-03-22 11:51:03.270573336 +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:
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 3aa47c9..4c65d63 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.18
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-missing-imports.patch
+Patch2: system-config-printer-reconnect-error.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -67,6 +68,9 @@ the configuration tool.
 # Import modules we catch exceptions from (bug #574117).
 %patch1 -p1 -b .missing-imports
 
+# Fixed reconnection error handling in IPPAuthOperation class (bug #575198).
+%patch2 -p1 -b .reconnect-error
+
 %build
 %configure
 
@@ -173,6 +177,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Mar 22 2010 Tim Waugh <twaugh@redhat.com> - 1.1.18-3
+- Fixed reconnection error handling in IPPAuthOperation class (bug #575198).
+
 * Tue Mar 16 2010 Tim Waugh <twaugh@redhat.com> - 1.1.18-2
 - Import modules we catch exceptions from (bug #574117).