On 01/27/10 06:17 PM, [email protected] wrote:
Folks,
The following is a short diff that addresses the traceback seen in
14201.  The fix is small enough that I didn't bother with a webrev.

diff -r 4409e56754c5 -r d9d66d2f1635 src/modules/client/transport/transport.py
--- a/src/modules/client/transport/transport.py Tue Jan 26 15:42:52 2010 +0000
+++ b/src/modules/client/transport/transport.py Wed Jan 27 16:14:40 2010 -0800
@@ -975,7 +975,10 @@
                  # Get publisher information from FMRI.
                  pub = self.__img.get_publisher(fmri.get_publisher())
                  # Use the publisher to get the catalog and its signature info.
-                sigs = dict(pub.catalog.get_entry_signatures(fmri))
+                try:
+                        sigs = dict(pub.catalog.get_entry_signatures(fmri))
+                except apx.UnknownCatalogEntry:
+                        return False

                  if sigs and "sha-1" in sigs:
                          chash = sigs["sha-1"]

This change or changing get_entry_signatures() to return None and checking for that is perfectly fine with me.

I remain concerned as I previously indicated that there is a larger issue that ultimately caused this, although I still believe transport should check for the no signature data case just in case there is a consistency issue between origins, etc.

If you'd be kind enough to file another entry for the first part of the problem under api-python, it would be appreciated.

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

Reply via email to