diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-07-07 22:43:34 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-07-07 22:43:34 +0000 |
| commit | 72e2f86b18a5c32a22f5cea0af8150355454bc27 (patch) | |
| tree | e23b0440b62392c5643cd1e42700c72dbe936e52 | |
| parent | ca61c5fad0f30702b0a43fb34d3b4afd41fc5e54 (diff) | |
| download | rdiff-backup-72e2f86b18a5c32a22f5cea0af8150355454bc27.tar.gz | |
Bugfixes for when Globals.chars_to_quote is None
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@813 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/rdiff_backup/manage.py | 13 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/restore.py | 5 |
2 files changed, 11 insertions, 7 deletions
diff --git a/rdiff-backup/rdiff_backup/manage.py b/rdiff-backup/rdiff_backup/manage.py index d4a97dc..2c9c7de 100644 --- a/rdiff-backup/rdiff_backup/manage.py +++ b/rdiff-backup/rdiff_backup/manage.py @@ -68,10 +68,15 @@ def describe_incs_human(incs, mirror_time, mirrorrp): incpairs.sort() result = ["Found %d increments:" % len(incpairs)] - for time, inc in incpairs: - result.append(" %s %s" % - (FilenameMapping.unquote(inc.dirsplit()[1]), - Time.timetopretty(time))) + if Globals.chars_to_quote: + for time, inc in incpairs: + result.append(" %s %s" % + (FilenameMapping.unquote(inc.dirsplit()[1]), + Time.timetopretty(time))) + else: + for time, inc in incpairs: + result.append(" %s %s" % + (inc.dirsplit()[1], Time.timetopretty(time))) result.append("Current mirror: %s" % Time.timetopretty(mirror_time)) return "\n".join(result) diff --git a/rdiff-backup/rdiff_backup/restore.py b/rdiff-backup/rdiff_backup/restore.py index 4498dac..414f04d 100644 --- a/rdiff-backup/rdiff_backup/restore.py +++ b/rdiff-backup/rdiff_backup/restore.py @@ -40,7 +40,7 @@ def Restore(mirror_rp, inc_rpath, target, restore_to_time): def get_inclist(inc_rpath): """Returns increments with given base""" dirname, basename = inc_rpath.dirsplit() - basename = FilenameMapping.unquote(basename) + if Globals.chars_to_quote: basename = FilenameMapping.unquote(basename) parent_dir = inc_rpath.__class__(inc_rpath.conn, dirname, ()) if not parent_dir.isdir(): return [] # inc directory not created yet index = inc_rpath.index @@ -48,8 +48,7 @@ def get_inclist(inc_rpath): inc_list = [] for filename in parent_dir.listdir(): inc = parent_dir.append(filename) - if inc.isincfile() and FilenameMapping.unquote( - inc.getincbase_str()) == basename: + if inc.isincfile() and inc.getincbase_str() == basename: inc_list.append(inc) return inc_list |