aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-03-28 17:01:49 +0000
committerRob Austein <sra@hactrn.net>2014-03-28 17:01:49 +0000
commit369ac53757381aafbbbe448e173cc93c70bc56c5 (patch)
tree272d45ee38eb2f0be5a32e136f2ac8acd7576659
parent26d703337a9f1ce045e1c4a28837d6f34ed4279d (diff)
Update to current version before final database close.
svn path=/branches/tk671/; revision=5710
-rw-r--r--rpkid/rpki-sql-upgrade9
1 files changed, 6 insertions, 3 deletions
diff --git a/rpkid/rpki-sql-upgrade b/rpkid/rpki-sql-upgrade
index d1551f9a..0ec6b476 100644
--- a/rpkid/rpki-sql-upgrade
+++ b/rpkid/rpki-sql-upgrade
@@ -80,7 +80,7 @@ class Database(object):
) ENGINE=InnoDB
"""
- def __init__(self, name):
+ def __init__(self, cfg, name):
self.name = name
self.enabled = cfg.getboolean("start_" + name, False)
if self.enabled:
@@ -173,8 +173,8 @@ args = parser.parse_args()
cfg = rpki.config.parser(args.config, "myrpki")
-rpkid_db = Database("rpkid")
-pubd_db = Database("pubd")
+rpkid_db = Database(cfg, "rpkid")
+pubd_db = Database(cfg, "pubd")
for upgrade in sorted(Upgrade.load_all(args.update_scripts)):
if upgrade.version > rpkid_db.version upgrade.version > pubd_db.version:
@@ -182,6 +182,9 @@ for upgrade in sorted(Upgrade.load_all(args.update_scripts)):
rpkid_db.version = upgrade.version
pubd_db.version = upgrade.version
+rpkid_db.version = current_version
rpkid_db.close()
+
+pubd_db.version = current_version
pubd_db.close()