diff options
| author | Rob Austein <sra@hactrn.net> | 2009-07-20 18:51:17 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-07-20 18:51:17 +0000 |
| commit | 907639a016bf9740dee40db2ae4025f64405e4bc (patch) | |
| tree | f96f666a1dabbac10491910cdb043c75bf7791b2 /rpkid | |
| parent | a9b1d9ec677291fb6d497f4b5b2c52b46c4b5054 (diff) | |
Helps to delete ROAs from SQL when destroying them.
svn path=/rpkid/rpki/rpki_engine.py; revision=2649
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/rpki/rpki_engine.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py index b7b0c5e0..e969c7a3 100644 --- a/rpkid/rpki/rpki_engine.py +++ b/rpkid/rpki/rpki_engine.py @@ -620,7 +620,7 @@ class ca_detail_obj(rpki.sql.sql_persistent): rpki.async.iterator(self.roas(), withdraw_one_roa, withdraw_manifest) def withdraw_one_roa(iterator, roa): - roa.withdraw_roa(iterator) + roa.withdraw_roa(iterator, eb) def withdraw_manifest(): repository.withdraw(self.latest_manifest, self.manifest_uri(ca), withdraw_crl, eb) @@ -1300,7 +1300,11 @@ class roa_obj(rpki.sql.sql_persistent): ca_detail.generate_crl(three, errback) def three(): - ca_detail.generate_manifest(callback, errback) + ca_detail.generate_manifest(four, errback) + + def four(): + self.sql_delete() + callback() if regenerate: self.generate_roa(one, errback) |