summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-01-05 18:43:13 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-01-05 18:43:13 +0000
commit6b6645d7faaa76d48ea4f6da1dfe346755b91c3f (patch)
treed9f31fb457fb4c02a857f0438306b35fed4d2981
parent44a41cc5d2f6b5ef1e83552702003b916412d624 (diff)
downloadrdiff-backup-6b6645d7faaa76d48ea4f6da1dfe346755b91c3f.tar.gz
Properly initialize QuotedRPaths
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@867 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG2
-rw-r--r--rdiff-backup/rdiff_backup/FilenameMapping.py9
2 files changed, 10 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 89a3187..645b787 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,6 +1,8 @@
New in v1.1.16 (????/??/??)
---------------------------
+Properly initialize new QuotedRPaths. Fixes --list-at-time, etc. when
+the target is remote. (Andrew Ferguson)
New in v1.1.15 (2008/01/03)
---------------------------
diff --git a/rdiff-backup/rdiff_backup/FilenameMapping.py b/rdiff-backup/rdiff_backup/FilenameMapping.py
index c63df53..5fbd9dd 100644
--- a/rdiff-backup/rdiff_backup/FilenameMapping.py
+++ b/rdiff-backup/rdiff_backup/FilenameMapping.py
@@ -124,8 +124,15 @@ class QuotedRPath(rpath.RPath):
def __init__(self, connection, base, index = (), data = None):
"""Make new QuotedRPath"""
self.quoted_index = tuple(map(quote, index))
- rpath.RPath.__init__(self, connection, base, self.quoted_index, data)
+ self.conn = connection
self.index = index
+ self.base = base
+ if base is not None:
+ if base == "/": self.path = "/" + "/".join(self.quoted_index)
+ else: self.path = "/".join((base,) + self.quoted_index)
+ self.file = None
+ if data or base is None: self.data = data
+ else: self.setdata()
def __setstate__(self, rpath_state):
"""Reproduce QuotedRPath from __getstate__ output"""