From c2df9f46b8a2c81aedceff403f0c49cab09d50b5 Mon Sep 17 00:00:00 2001 From: owsla Date: Mon, 24 Dec 2007 22:39:47 +0000 Subject: - 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 --- rdiff-backup/rdiff_backup/Main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rdiff-backup/rdiff_backup/Main.py') 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 -- cgit v1.2.1