diff options
author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-12-24 22:39:47 +0000 |
---|---|---|
committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-12-24 22:39:47 +0000 |
commit | c2df9f46b8a2c81aedceff403f0c49cab09d50b5 (patch) | |
tree | 945961d71c9c63a6560a2834fa7724bf73c34885 /rdiff-backup/rdiff_backup/Main.py | |
parent | 231fe19bbb7c2101db97eef60c28232b0e4e4875 (diff) | |
download | rdiff-backup-c2df9f46b8a2c81aedceff403f0c49cab09d50b5.tar.gz |
- Replace is_readable() function with pre-existing readable() function
- Close Savannah bug #21202 by not assuming that file cannot be opened
even if read permissions don't indicate such.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@855 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/Main.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/Main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py index d9b57e3..155cd90 100644 --- a/rdiff-backup/rdiff_backup/Main.py +++ b/rdiff-backup/rdiff_backup/Main.py @@ -598,7 +598,7 @@ def restore_set_root(rpin): i = len(pathcomps) while i >= min_len_pathcomps: parent_dir = rpath.RPath(rpin.conn, "/".join(pathcomps[:i])) - if (parent_dir.isdir() and parent_dir.is_readable() and + if (parent_dir.isdir() and parent_dir.readable() and "rdiff-backup-data" in parent_dir.listdir()): break if parent_dir.path == rpin.conn.Globals.get('restrict_path'): return None |