diff options
author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-12-23 02:59:34 +0000 |
---|---|---|
committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-12-23 02:59:34 +0000 |
commit | 231fe19bbb7c2101db97eef60c28232b0e4e4875 (patch) | |
tree | 95099f2efbad07845d00fd1e4c915706b9bb9bae /rdiff-backup/rdiff_backup/Main.py | |
parent | 44b6564c198e11c7da81430864214d68dc835442 (diff) | |
download | rdiff-backup-231fe19bbb7c2101db97eef60c28232b0e4e4875.tar.gz |
restore_set_root should check if it can read a directory before trying
to list the contents. Closes Savannah bug #21106
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@854 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 70adcfc..d9b57e3 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 + if (parent_dir.isdir() and parent_dir.is_readable() and "rdiff-backup-data" in parent_dir.listdir()): break if parent_dir.path == rpin.conn.Globals.get('restrict_path'): return None |