summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2004-05-16 20:50:33 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2004-05-16 20:50:33 +0000
commit977ad2081502ace96ac0bd2485b524ee6d9fd1ad (patch)
tree6e306b0a4334a2eba362bbf2d9485876e69958ec
parent4218200d30422a9954a6f2fe95f29c4e4876407b (diff)
downloadrdiff-backup-977ad2081502ace96ac0bd2485b524ee6d9fd1ad.tar.gz
Dean Gaudet fix for --calculate-average
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@527 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG6
-rw-r--r--rdiff-backup/rdiff_backup/Main.py3
2 files changed, 8 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 3ac74b3..5cbefd8 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -4,6 +4,12 @@ New in v0.13.5 (2004/??/??)
Added error-correcting fsync suggestion by Antoine Perdaens.
rdiff-backup may work better with NFS now.
+Fix by Dean Gaudet for --calculate-average mode (it broke somewhere in
+0.13.x).
+
+Fix for regress warning code: rdiff-backup should warn you if you are
+trying to back up a directory into itself.
+
New in v0.13.4 (2004/01/31)
---------------------------
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py
index 2ff5c58..d591436 100644
--- a/rdiff-backup/rdiff_backup/Main.py
+++ b/rdiff-backup/rdiff_backup/Main.py
@@ -178,7 +178,8 @@ def check_action():
if l == 2: pass # Will determine restore or backup later
else:
commandline_error("Switches missing or wrong number of arguments")
- elif action == 'test-server': pass # test-server takes any number of args
+ elif action == 'test-server' or action == 'calculate-average':
+ pass # these two take any number of args
elif l > 2 or action not in arg_action_dict[l]:
commandline_error("Wrong number of arguments given.")