The fix for 14173 is small enough that it fits in this diff.  Can I get someone
to take a quick look at this fix?  It should be an open/shut deal.

Thanks,

-j

diff -r 5659c00259ca src/modules/client/transport/engine.py
--- a/src/modules/client/transport/engine.py    Tue Jan 26 12:54:29 2010 -0800
+++ b/src/modules/client/transport/engine.py    Tue Jan 26 13:00:38 2010 -0800
@@ -177,13 +177,13 @@
                                 decay = httpcode in tx.decayable_http_errors
                                 repostats.record_error(decayable=decay)
                                 errors_seen += 1
+                                proto_reason = None
                                 if proto in tx.proto_code_map:
                                         # Look up protocol error code map
                                         # from transport exception's table.
                                         pmap = tx.proto_code_map[proto]
-                                        proto_reason = pmap[httpcode]
-                                else:
-                                        proto_reason = None
+                                        if httpcode in pmap:
+                                                proto_reason = pmap[httpcode]
                                 ex = tx.TransportProtoError(proto, httpcode,
                                     url, reason=proto_reason, repourl=urlstem)
                         elif en == pycurl.E_OPERATION_TIMEOUTED:
@@ -251,13 +251,14 @@
                                 repostats.clear_consecutive_errors()
                                 success.append(url)
                         else:
+                                proto_reason = None
+
                                 if proto in tx.proto_code_map:
                                         # Look up protocol error code map
                                         # from transport exception's table.
                                         pmap = tx.proto_code_map[proto]
-                                        proto_reason = pmap[httpcode]
-                                else:
-                                        proto_reason = None
+                                        if httpcode in pmap:
+                                                proto_reason = pmap[httpcode]
                                 ex = tx.TransportProtoError(proto,
                                     httpcode, url, reason=proto_reason,
                                     repourl=urlstem)

_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss

Reply via email to