← Back to team overview

duplicity-team team mailing list archive

[Merge] lp:~ed.so/duplicity/verify.data into lp:duplicity

 

edso has proposed merging lp:~ed.so/duplicity/verify.data into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~ed.so/duplicity/verify.data/+merge/148873

see commit message, man page doc will be in lp:~ed.so/duplicity/man.page
-- 
https://code.launchpad.net/~ed.so/duplicity/verify.data/+merge/148873
Your team duplicity-team is requested to review the proposed merge of lp:~ed.so/duplicity/verify.data into lp:duplicity.
=== modified file 'bin/duplicity'
--- bin/duplicity	2013-01-06 18:12:52 +0000
+++ bin/duplicity	2013-02-16 13:47:21 +0000
@@ -759,7 +759,7 @@
             backup_ropath = path.ROPath(current_path.index)
         if not current_path:
             current_path = path.ROPath(backup_ropath.index)
-        if not backup_ropath.compare_verbose(current_path):
+        if not backup_ropath.compare_verbose(current_path, globals.verify_data):
             diff_count += 1
         total_count += 1
     # Unfortunately, ngettext doesn't handle multiple number variables, so we

=== modified file 'duplicity/commandline.py'
--- duplicity/commandline.py	2013-01-18 15:17:55 +0000
+++ duplicity/commandline.py	2013-02-16 13:47:21 +0000
@@ -532,6 +532,8 @@
                       dest="", action="callback",
                       callback=lambda o, s, v, p: log.setverbosity(v))
 
+    parser.add_option("--verify-data", action="store_true")
+
     parser.add_option("-V", "--version", action="callback", callback=print_ver)
 
     # volume size

=== modified file 'duplicity/globals.py'
--- duplicity/globals.py	2013-01-10 19:04:39 +0000
+++ duplicity/globals.py	2013-02-16 13:47:21 +0000
@@ -241,3 +241,6 @@
 
 # Renames (--rename)
 rename = {}
+
+# enable data comparison on verify runs
+verify_data = False


Follow ups