summaryrefslogtreecommitdiff
path: root/tools/mergestatus.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2017-07-25 13:32:26 +0200
committerMagnus Ahltorp <map@kth.se>2017-07-25 13:32:26 +0200
commit5105a511348e58629b394373730f9bf91c3e888e (patch)
tree2ebc9618315ef7e1c520ebbe3baf7b9a51830e8f /tools/mergestatus.py
parent24569ff28412cb1b439070e83caa3bbb5fbd01c5 (diff)
Change paths/mergedb to paths/db in local configdocgen2
Remove unused config variable paths/publickeys
Diffstat (limited to 'tools/mergestatus.py')
-rwxr-xr-xtools/mergestatus.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mergestatus.py b/tools/mergestatus.py
index 95cf2e8..9dbbb7b 100755
--- a/tools/mergestatus.py
+++ b/tools/mergestatus.py
@@ -22,7 +22,7 @@ def main():
args, config, localconfig = parse_args()
paths = localconfig["paths"]
mergenodes = config.get("mergenodes", [])
- mergedb = paths["mergedb"]
+ mergedb = paths["db"]
sthfile = mergedb + "/sth"
currentsizefile = mergedb + "/fetched"