diff options
| author | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-03-27 19:30:06 +0000 |
|---|---|---|
| committer | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-03-27 19:30:06 +0000 |
| commit | 255ff815f53ef29eba764ed5ab859b63fb863161 (patch) | |
| tree | afe4694ee8afdd3bd3bd7027ab56ea1c53562f53 | |
| parent | 812fddc9d674b762e56f343a7dbc6fbe87fb64e9 (diff) | |
| download | rdiff-backup-255ff815f53ef29eba764ed5ab859b63fb863161.tar.gz | |
main - fixed error reporting bug in restore check pathnames
rpath - noted that tupled_lstat unnecessary after 2.2.1
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@30 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/rdiff_backup/rpath.py | 2 | ||||
| -rwxr-xr-x | rdiff-backup/src/main.py | 4 | ||||
| -rw-r--r-- | rdiff-backup/src/rpath.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py index 56be1d1..c1f0a44 100644 --- a/rdiff-backup/rdiff_backup/rpath.py +++ b/rdiff-backup/rdiff_backup/rpath.py @@ -173,7 +173,7 @@ class RPathStatic: Later versions of os.lstat return a special lstat object, which can confuse the pickler and cause errors in remote - operations. + operations. This has been fixed in Python 2.2.1. """ try: return tuple(os.lstat(filename)) diff --git a/rdiff-backup/src/main.py b/rdiff-backup/src/main.py index 3e00a7e..0558302 100755 --- a/rdiff-backup/src/main.py +++ b/rdiff-backup/src/main.py @@ -286,12 +286,12 @@ went wrong during your last backup? Using """ + mirrorrps[-1].path, 2) def restore_check_paths(self, rpin, rpout): """Check paths and return pair of corresponding rps""" if not rpin.lstat(): - Log.FatalError("Increment file %s does not exist" % src_path) + Log.FatalError("Increment file %s does not exist" % rpin.path) if not rpin.isincfile(): Log.FatalError("""File %s does not look like an increment file. Try restoring from an increment file (the filenames look like -"foobar.2001-09-01T04:49:04-07:00.diff").""") +"foobar.2001-09-01T04:49:04-07:00.diff").""" % rpin.path) if not rpout: rpout = RPath(Globals.local_connection, rpin.getincbase_str()) diff --git a/rdiff-backup/src/rpath.py b/rdiff-backup/src/rpath.py index 56be1d1..c1f0a44 100644 --- a/rdiff-backup/src/rpath.py +++ b/rdiff-backup/src/rpath.py @@ -173,7 +173,7 @@ class RPathStatic: Later versions of os.lstat return a special lstat object, which can confuse the pickler and cause errors in remote - operations. + operations. This has been fixed in Python 2.2.1. """ try: return tuple(os.lstat(filename)) |