diff options
| -rwxr-xr-x | rpkid/rootd.py | 4 | ||||
| -rw-r--r-- | rpkid/rpki/left_right.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/resource_set.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/up_down.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/rpkid/rootd.py b/rpkid/rootd.py index 03bf4c5e..ca59eb75 100755 --- a/rpkid/rootd.py +++ b/rpkid/rootd.py @@ -107,7 +107,7 @@ class issue_pdu(rpki.up_down.issue_pdu): thisUpdate = now, nextUpdate = now + rpki_subject_lifetime, revokedCertificates = ()) - rpki.log.debug("Writing CRL %s" % rpki_root_dir + rpki_root_crl) + rpki.log.debug("Writing CRL %s" % (rpki_root_dir + rpki_root_crl)) f = open(rpki_root_dir + rpki_root_crl, "wb") f.write(crl.get_DER()) f.close() @@ -133,7 +133,7 @@ class issue_pdu(rpki.up_down.issue_pdu): names_and_objs = [(rpki_subject_cert, subject_cert), (rpki_root_crl, crl)], keypair = manifest_keypair, certs = manifest_cert) - rpki.log.debug("Writing manifest %s" % rpki_root_dir + rpki_root_manifest) + rpki.log.debug("Writing manifest %s" % (rpki_root_dir + rpki_root_manifest)) f = open(rpki_root_dir + rpki_root_manifest, "wb") f.write(manifest.get_DER()) f.close() diff --git a/rpkid/rpki/left_right.py b/rpkid/rpki/left_right.py index d4c051f1..7de8f8ab 100644 --- a/rpkid/rpki/left_right.py +++ b/rpkid/rpki/left_right.py @@ -54,7 +54,7 @@ class data_elt(rpki.xml_utils.data_elt, rpki.sql.sql_persistant, left_right_name args = (getattr(self, self.sql_template.index), self.self_id) r = self.sql_fetch_where1(self.gctx, where, args) if r is None: - raise rpki.exceptions.NotFound, "Lookup failed where %s" + (where % args) + raise rpki.exceptions.NotFound, "Lookup failed where " + (where % args) return r def serve_fetch_all(self): diff --git a/rpkid/rpki/resource_set.py b/rpkid/rpki/resource_set.py index c8f180e6..baaccfc4 100644 --- a/rpkid/rpki/resource_set.py +++ b/rpkid/rpki/resource_set.py @@ -126,7 +126,7 @@ class resource_range_ip(resource_range): assert isinstance(address, cls.datum_type) and isinstance(prefixlen, (int, long)) assert prefixlen >= 0 and prefixlen <= cls.datum_type.bits, "Nonsensical prefix length: %s" % prefixlen mask = (1 << (cls.datum_type.bits - prefixlen)) - 1 - assert (address & mask) == 0, "Resource not in canonical form: %s/s" % (address, prefixlen) + assert (address & mask) == 0, "Resource not in canonical form: %s/%s" % (address, prefixlen) return cls(cls.datum_type(address), cls.datum_type(address | mask)) class resource_range_ipv4(resource_range_ip): diff --git a/rpkid/rpki/up_down.py b/rpkid/rpki/up_down.py index 660c5ce8..a10c4c07 100644 --- a/rpkid/rpki/up_down.py +++ b/rpkid/rpki/up_down.py @@ -418,7 +418,7 @@ class error_response_pdu(base_elt): if name == "status": code = int(text) if code not in self.codes: - raise rpki.exceptions.BadStatusCode, "%s is not a known status code" + raise rpki.exceptions.BadStatusCode, "%s is not a known status code" % code self.status = code elif name == "description": self.description = text |