diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-04-22 01:29:45 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-04-22 01:29:45 +0000 |
| commit | b6d8d7c88405ce1ede389ab01820c4c0dac9aee4 (patch) | |
| tree | 8adee080927d8d123f63ce0aa0c2c62f04dbd88d | |
| parent | 3149d3b91bcec18a6e1ac1f43fefe8c70574b4aa (diff) | |
| download | rdiff-backup-b6d8d7c88405ce1ede389ab01820c4c0dac9aee4.tar.gz | |
Changed remove_older_than errorlevel when no increments found
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@318 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/rdiff_backup/FilenameMapping.py | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/Main.py | 4 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/log.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/rdiff-backup/rdiff_backup/FilenameMapping.py b/rdiff-backup/rdiff_backup/FilenameMapping.py index fdcd017..117d711 100644 --- a/rdiff-backup/rdiff_backup/FilenameMapping.py +++ b/rdiff-backup/rdiff_backup/FilenameMapping.py @@ -68,7 +68,7 @@ def init_quoting_regexps(): global chars_to_quote_regexp, unquoting_regexp try: chars_to_quote_regexp = \ - re.compile("[%s%s]" % (chars_to_quote, quoting_char), re.S) + re.compile("[%s]|%s" % (chars_to_quote, quoting_char), re.S) unquoting_regexp = re.compile("%s[0-9]{3}" % quoting_char, re.S) except re.error: log.Log.FatalError("Error '%s' when processing char quote list %s" % diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py index b4a9f59..4fa911b 100644 --- a/rdiff-backup/rdiff_backup/Main.py +++ b/rdiff-backup/rdiff_backup/Main.py @@ -145,7 +145,7 @@ def parse_cmdlineoptions(arglist): sys.exit(0) elif opt == "-v" or opt == "--verbosity": Log.setverbosity(arg) elif opt == "--windows-mode": - Globals.set('chars_to_quote', "A-Z:\\/*?\"<>|") + Globals.set('chars_to_quote', "^a-z._ -") Globals.set('quoting_enabled', 1) Globals.set('preserve_hardlinks', 0) Globals.set('change_ownership', 0) @@ -535,7 +535,7 @@ def RemoveOlderThan(rootrp): times_in_secs = filter(lambda t: t < time, times_in_secs) if not times_in_secs: Log.FatalError("No increments older than %s found, exiting." - % (timep,), 1) + % (timep,), 1, errlevel = 0) times_in_secs.sort() inc_pretty_time = "\n".join(map(Time.timetopretty, times_in_secs)) diff --git a/rdiff-backup/rdiff_backup/log.py b/rdiff-backup/rdiff_backup/log.py index 60ef434..53126e5 100644 --- a/rdiff-backup/rdiff_backup/log.py +++ b/rdiff-backup/rdiff_backup/log.py @@ -150,7 +150,7 @@ class Logger: self.log_to_term("%s %s (%d): %s" % (conn_str, direction, req_num, result_repr), 9) - def FatalError(self, message, no_fatal_message = 0): + def FatalError(self, message, no_fatal_message = 0, errlevel = 1): """Log a fatal error and exit""" assert no_fatal_message == 0 or no_fatal_message == 1 if no_fatal_message: prefix_string = "" @@ -158,7 +158,7 @@ class Logger: self(prefix_string + message, 1) import Main Main.cleanup() - sys.exit(1) + sys.exit(errlevel) def exception_to_string(self, arglist = []): """Return string version of current exception plus what's in arglist""" |