From e45daca8cd949db2a08d62e141795f68d53c5f05 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 26 May 2016 13:07:28 +0000 Subject: Remove gratuitous None values from status database -- this appears to have been incomplete conversion from an older internal API, back when we still had Generation objects. In any case, status="None" in rcynic.xml is wrong, and has been giving rcynic-html indigestion. svn path=/branches/tk705/; revision=6440 --- rp/rcynic/rcynicng | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rp/rcynic/rcynicng b/rp/rcynic/rcynicng index 57930cb4..9e41ca90 100755 --- a/rp/rcynic/rcynicng +++ b/rp/rcynic/rcynicng @@ -459,7 +459,7 @@ class_dispatch = dict(cer = X509, def uri_to_class(uri): cls = class_dispatch.get(uri[-3:]) if len(uri) > 4 and uri[-4] == "." else None if cls is None: - Status.add(uri, None, codes.UNKNOWN_OBJECT_TYPE_SKIPPED) + Status.add(uri, codes.UNKNOWN_OBJECT_TYPE_SKIPPED) return cls @@ -615,7 +615,7 @@ class WalkFrame(object): continue if cls in (Manifest, CRL): - Status.add(uri, None, codes.INAPPROPRIATE_OBJECT_TYPE_SKIPPED) + Status.add(uri, codes.INAPPROPRIATE_OBJECT_TYPE_SKIPPED) continue for obj in fetch_objects(sha256 = digest.encode("hex")): @@ -690,10 +690,10 @@ def read_tals(): uris = lines[:blank] key = rpki.POW.Asymmetric.derReadPublic("".join(lines[blank:]).decode("base64")) if not uris or not all(uri.endswith(".cer") for uri in uris): - Status.add(furi, None, codes.MALFORMED_TAL_URI) + Status.add(furi, codes.MALFORMED_TAL_URI) yield uris, key except: - Status.add(furi, None, codes.UNREADABLE_TRUST_ANCHOR_LOCATOR) + Status.add(furi, codes.UNREADABLE_TRUST_ANCHOR_LOCATOR) def uri_to_filename(uri, base = None): -- cgit v1.2.3