diff options
| author | Rob Austein <sra@hactrn.net> | 2010-03-08 22:59:03 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-03-08 22:59:03 +0000 |
| commit | 911052ccce44e90d3c40387db5c7cb2a53dc6f08 (patch) | |
| tree | 3a949d144c9a12d3121e969235f835a87bf6e240 /myrpki.rototill/myirbe.py | |
| parent | 64b65db19897e650461373ba3e8cffb3e92553a5 (diff) | |
Consolidated entitydb() mechanism
svn path=/myrpki.rototill/myirbe.py; revision=3047
Diffstat (limited to 'myrpki.rototill/myirbe.py')
| -rw-r--r-- | myrpki.rototill/myirbe.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/myrpki.rototill/myirbe.py b/myrpki.rototill/myirbe.py index c792383f..2aa43c35 100644 --- a/myrpki.rototill/myirbe.py +++ b/myrpki.rototill/myirbe.py @@ -150,6 +150,8 @@ db = MySQLdb.connect(user = irdbd_cfg.get("sql-username"), cur = db.cursor() +entitydb = myrpki.EntityDB(cfg) + xmlfiles = [] # If [myrpki] section includes an "xml_filename" setting, run @@ -418,13 +420,11 @@ for xmlfile in xmlfiles: rpkid_query.extend(rpki.left_right.child_elt.make_pdu( action = "destroy", self_handle = handle, child_handle = c) for c in child_pdus) - # Publication setup, used to be inferred (badly) from parent setup, - # now handled explictly via yet another freaking .csv file. + # Publication setup. if run_pubd: - # Need something like setup.py's entitydb() function. Wire in pathnames for now. - for f in glob.iglob("entitydb/pubclients/*.xml"): + for f in entitydb.iterate("pubclients", "*.xml"): c = myrpki.etree_read(f) client_handle = c.get("client_handle") |