diff options
author | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-05-20 19:26:02 +0000 |
---|---|---|
committer | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-05-20 19:26:02 +0000 |
commit | 91a5369ef256424d0cc38434c7fd4f4aac1264bd (patch) | |
tree | 17954d13780197e1cbaab5e3ef4e446fa27bfea6 /rdiff-backup/rdiff_backup | |
parent | 1f4e957cd505f5cd3bcb6902e266b5bad6b17209 (diff) | |
download | rdiff-backup-91a5369ef256424d0cc38434c7fd4f4aac1264bd.tar.gz |
Various bug fixes so it passes tests
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@93 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup')
-rw-r--r-- | rdiff-backup/rdiff_backup/header.py | 2 | ||||
-rw-r--r-- | rdiff-backup/rdiff_backup/highlevel.py | 14 | ||||
-rw-r--r-- | rdiff-backup/rdiff_backup/robust.py | 22 | ||||
-rw-r--r-- | rdiff-backup/rdiff_backup/selection.py | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/rdiff-backup/rdiff_backup/header.py b/rdiff-backup/rdiff_backup/header.py index 71ca7d2..4e1de8e 100644 --- a/rdiff-backup/rdiff_backup/header.py +++ b/rdiff-backup/rdiff_backup/header.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # # rdiff-backup -- Mirror files while keeping incremental changes -# Version 0.7.4 released May 11, 2002 +# Version 0.7.5 released May 20, 2002 # Copyright (C) 2001, 2002 Ben Escoto <bescoto@stanford.edu> # # This program is licensed under the GNU General Public License (GPL). diff --git a/rdiff-backup/rdiff_backup/highlevel.py b/rdiff-backup/rdiff_backup/highlevel.py index 36ac997..e1cfc28 100644 --- a/rdiff-backup/rdiff_backup/highlevel.py +++ b/rdiff-backup/rdiff_backup/highlevel.py @@ -100,11 +100,11 @@ class HLSourceStruct: if dest_sig: if dest_sig.isplaceholder(): yield dest_sig else: - try: yield RORPIter.diffonce(dest_sig, dsrp) - except (IOError, OSError, RdiffException): - Log.exception() - Log("Error producing a diff of %s" % - dsrp and dsrp.path) + diff = Robust.check_common_error( + lambda: RORPIter.diffonce(dest_sig, dsrp), + lambda exc: Log("Error %s producing a diff of %s" % + (str(exc), dsrp and dsrp.path), 2)) + if diff: yield diff if dsrp: finalizer(dsrp.index, dsrp) finalizer.Finish() return diffs() @@ -269,10 +269,10 @@ class HLDestinationStruct: """Run thunk, catch certain errors skip files""" try: return thunk() except (EnvironmentError, SkipFileException, DSRPPermError, - RPathException), exp: + RPathException), exc: Log.exception() if (not isinstance(exc, EnvironmentError) or - (errno.errorcode[exp[0]] in + (errno.errorcode[exc[0]] in ['EPERM', 'ENOENT', 'EACCES', 'EBUSY', 'EEXIST', 'ENOTDIR', 'ENAMETOOLONG', 'EINTR', 'ENOTEMPTY', 'EIO', # reported by docv diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py index a5b1056..e92a701 100644 --- a/rdiff-backup/rdiff_backup/robust.py +++ b/rdiff-backup/rdiff_backup/robust.py @@ -1,4 +1,4 @@ -import tempfile +import tempfile, errno execfile("hardlink.py") ####################################################################### @@ -56,10 +56,10 @@ class RobustAction: try: self.init_thunk() self.final_thunk() - except Exception, exp: # Catch all errors + except Exception, exc: # Catch all errors Log.exception() - self.error_thunk(exp) - raise exp + self.error_thunk(exc) + raise exc class Robust: @@ -79,8 +79,8 @@ class Robust: ra.init_thunk() def final(): for ra in robust_action_list: ra.final_thunk() - def error(exp): - for ra in ras_with_completed_inits: ra.error_thunk(exp) + def error(exc): + for ra in ras_with_completed_inits: ra.error_thunk(exc) return RobustAction(init, final, error) def chain_nested(robust_action_list): @@ -94,8 +94,8 @@ class Robust: ralist_copy = robust_action_list[:] ralist_copy.reverse() for ra in ralist_copy: ra.final_thunk() - def error(exp): - for ra in ras_with_completed_inits: ra.error_thunk(exp) + def error(exc): + for ra in ras_with_completed_inits: ra.error_thunk(exc) return RobustAction(init, final, error) def make_tf_robustaction(init_thunk, tempfiles, final_renames = None): @@ -118,7 +118,7 @@ class Robust: if final_name.isdir(): # Cannot rename over directory final_name.delete() tempfiles[i].rename(final_name) - def error(exp): + def error(exc): for tf in tempfiles: tf.delete() return RobustAction(init_thunk, final, error) @@ -203,7 +203,7 @@ class Robust: RPathException), exc: Log.exception() if (not isinstance(exc, EnvironmentError) or - (errno.errorcode[exp[0]] in + (errno.errorcode[exc[0]] in ['EPERM', 'ENOENT', 'EACCES', 'EBUSY', 'EEXIST', 'ENOTDIR', 'ENAMETOOLONG', 'EINTR', 'ENOTEMPTY', 'EIO', # reported by docv @@ -363,7 +363,7 @@ class SaveState: ('increments',) + last_file_rorp.index) return Robust.symlink_action(cls._last_file_sym, symtext) else: return RobustAction(lambda: None, cls.touch_last_file, - lambda exp: None) + lambda exc: None) def checkpoint_inc_backup(cls, ITR, finalizer, last_file_rorp, override = None): diff --git a/rdiff-backup/rdiff_backup/selection.py b/rdiff-backup/rdiff_backup/selection.py index 0bb46e2..94da6f1 100644 --- a/rdiff-backup/rdiff_backup/selection.py +++ b/rdiff-backup/rdiff_backup/selection.py @@ -283,12 +283,12 @@ probably isn't what you meant.""" % for line in filelist_fp: if not line.strip(): continue # skip blanks try: tuple = self.filelist_parse_line(line, include) - except FilePrefixError, exp: + except FilePrefixError, exc: prefix_warnings += 1 if prefix_warnings < 6: Log("Warning: file specification %s in filelist %s\n" "doesn't start with correct prefix %s, ignoring." % - (exp, filelist_name, self.prefix), 2) + (exc, filelist_name, self.prefix), 2) if prefix_warnings == 5: Log("Future prefix errors will not be logged.", 2) tuple_list.append(tuple) |