Add --noverify option to merge.py.

1 files changed, 3 insertions, 1 deletions

diff --git a/tools/merge.py b/tools/merge.py
index 9904b84..69d503b 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -30,6 +30,7 @@ parser.add_argument('--config', help="System configuration", required=True)
 parser.add_argument('--localconfig', help="Local configuration", required=True)
 parser.add_argument("--nomerge", action='store_true', help="Don't actually do merge")
 parser.add_argument("--timing", action='store_true', help="Print timing information")
+parser.add_argument("--noverify", action='store_true', help="Don't verify entries")
 args = parser.parse_args()
 
 config = yaml.load(open(args.config))
@@ -234,7 +235,8 @@ for storagenode in storagenodes:
         entries = get_entries(storagenode["name"], "https://%s/" % storagenode["address"], chunk)
         for hash in chunk:
             entry = entries[hash]
-            verify_entry(verifycert, entry, hash)
+            if not noverify:
+                verify_entry(verifycert, entry, hash)
             write_chain(hash, entry)
             add_to_logorder(hash)
             logorder.append(hash)