diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2004-01-31 21:34:17 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2004-01-31 21:34:17 +0000 |
commit | 1559cf861919eaf534989dd612165c999aeb016a (patch) | |
tree | 42b34d508c59bcc090d8d37decae603efe7d6389 /rdiff-backup/rdiff_backup/Main.py | |
parent | 643967ad481bea69ff47d289f656286bf5f2e3b3 (diff) | |
download | rdiff-backup-1559cf861919eaf534989dd612165c999aeb016a.tar.gz |
Now arg to --restrict options normalized
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r0-12@517 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/Main.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/Main.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py index ad0440c..15258e1 100644 --- a/rdiff-backup/rdiff_backup/Main.py +++ b/rdiff-backup/rdiff_backup/Main.py @@ -42,6 +42,10 @@ def parse_cmdlineoptions(arglist): try: return open(filename, "r") except IOError: Log.FatalError("Error opening file %s" % filename) + def normalize_path(path): + """Used below to normalize the security paths before setting""" + return rpath.RPath(Globals.local_connection, path).normalize().path + try: optlist, args = getopt.getopt(arglist, "blr:sv:V", ["backup-mode", "calculate-average", "chars-to-quote=", "check-destination-dir", "current-time=", "exclude=", @@ -128,13 +132,13 @@ def parse_cmdlineoptions(arglist): elif opt == "--remove-older-than": remove_older_than_string = arg action = "remove-older-than" - elif opt == "--restrict": Globals.restrict_path = arg + elif opt == "--restrict": Globals.restrict_path = normalize_path(arg) elif opt == "--restrict-read-only": Globals.security_level = "read-only" - Globals.restrict_path = arg + Globals.restrict_path = normalize_path(arg) elif opt == "--restrict-update-only": Globals.security_level = "update-only" - Globals.restrict_path = arg + Globals.restrict_path = normalize_path(arg) elif opt == "-s" or opt == "--server": action = "server" Globals.server = 1 |