diff options
| author | Rob Austein <sra@hactrn.net> | 2016-02-25 05:41:39 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-02-25 05:41:39 +0000 |
| commit | 6ace14c177512efa879b4381f61fe8419c1af97f (patch) | |
| tree | c1216779abad74d197e0489ceb107a525d60a795 /rpki/rpkid_tasks.py | |
| parent | 0cb4fd22d12f89be036aaa9acab58183596ce21e (diff) | |
Dumb errors constructing key for temporary dict() were causing us to
generate duplicate ROAs.
svn path=/branches/tk705/; revision=6283
Diffstat (limited to 'rpki/rpkid_tasks.py')
| -rw-r--r-- | rpki/rpkid_tasks.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rpki/rpkid_tasks.py b/rpki/rpkid_tasks.py index faaa0bd9..1a627073 100644 --- a/rpki/rpkid_tasks.py +++ b/rpki/rpkid_tasks.py @@ -425,7 +425,7 @@ class UpdateROAsTask(AbstractTask): self.ca_details = set() # pylint: disable=W0201 for roa in self.tenant.roas.all(): - k = (roa.asn, str(roa.ipv4), str(roa.ipv6)) + k = "{!s} {!s} {!s}".format(roa.asn, roa.ipv4, roa.ipv6) if k not in roas: roas[k] = roa elif roa.roa is not None and roa.cert is not None and roa.ca_detail is not None and roa.ca_detail.state == "active" and (roas[k].roa is None or roas[k].cert is None or roas[k].ca_detail is None or roas[k].ca_detail.state != "active"): @@ -435,7 +435,7 @@ class UpdateROAsTask(AbstractTask): orphans.append(roa) for r_pdu in r_msg: - k = (r_pdu.get("asn"), r_pdu.get("ipv4"), r_pdu.get("ipv6")) + k = "{!s} {!s} {!s}".format(r_pdu.get("asn"), r_pdu.get("ipv4"), r_pdu.get("ipv6")) if k in seen: logger.warning("%r: Skipping duplicate ROA request %r", self, r_pdu) else: |