Commit b5c6ff36 authored by ben's avatar ben

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@30 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent c45359b8
...@@ -173,7 +173,7 @@ class RPathStatic: ...@@ -173,7 +173,7 @@ class RPathStatic:
Later versions of os.lstat return a special lstat object, Later versions of os.lstat return a special lstat object,
which can confuse the pickler and cause errors in remote 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)) try: return tuple(os.lstat(filename))
......
...@@ -286,12 +286,12 @@ went wrong during your last backup? Using """ + mirrorrps[-1].path, 2) ...@@ -286,12 +286,12 @@ went wrong during your last backup? Using """ + mirrorrps[-1].path, 2)
def restore_check_paths(self, rpin, rpout): def restore_check_paths(self, rpin, rpout):
"""Check paths and return pair of corresponding rps""" """Check paths and return pair of corresponding rps"""
if not rpin.lstat(): 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(): if not rpin.isincfile():
Log.FatalError("""File %s does not look like an increment file. Log.FatalError("""File %s does not look like an increment file.
Try restoring from an increment file (the filenames look like 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, if not rpout: rpout = RPath(Globals.local_connection,
rpin.getincbase_str()) rpin.getincbase_str())
......
...@@ -173,7 +173,7 @@ class RPathStatic: ...@@ -173,7 +173,7 @@ class RPathStatic:
Later versions of os.lstat return a special lstat object, Later versions of os.lstat return a special lstat object,
which can confuse the pickler and cause errors in remote 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)) try: return tuple(os.lstat(filename))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment