Commit ac37fabe authored by bescoto's avatar bescoto

Final checkin for 0.11.5


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@322 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent 1f290195
Make restores tolerant of missing files Make restores tolerant of missing files
Look into hard linking on windows
Added --include/--exclude options for restoring Added --include/--exclude options for restoring
---------[ Medium term ]--------------------------------------- ---------[ Medium term ]---------------------------------------
Look into security.py code, do some sort of security audit.
Don't require increments.<date>.dir files to be setuid/setgid, or Don't require increments.<date>.dir files to be setuid/setgid, or
don't even have the backup files. (Andrew Bressen) don't even have the backup files. (Andrew Bressen)
......
...@@ -381,7 +381,8 @@ class RestoreFile: ...@@ -381,7 +381,8 @@ class RestoreFile:
def get_restore_fp(self): def get_restore_fp(self):
"""Return file object of restored data""" """Return file object of restored data"""
assert self.relevant_incs[-1].isreg() assert self.relevant_incs[-1].isreg(), \
(mirror_rp.index, self.relevant_incs[-1].lstat())
current_fp = self.get_first_fp() current_fp = self.get_first_fp()
for inc_diff in self.relevant_incs[1:]: for inc_diff in self.relevant_incs[1:]:
log.Log("Applying patch %s" % (inc_diff.get_indexpath(),), 7) log.Log("Applying patch %s" % (inc_diff.get_indexpath(),), 7)
......
...@@ -180,6 +180,8 @@ class IncrementTest1(unittest.TestCase): ...@@ -180,6 +180,8 @@ class IncrementTest1(unittest.TestCase):
InternalBackup(1, 1, hldir.path, Local.rpout.path, current_time = 1) InternalBackup(1, 1, hldir.path, Local.rpout.path, current_time = 1)
InternalBackup(1, 1, "testfiles/empty", Local.rpout.path, InternalBackup(1, 1, "testfiles/empty", Local.rpout.path,
current_time = 10000) current_time = 10000)
(Globals.quoting_enabled, Globals.chars_to_quote,
Globals.quoting_char) = old_settings
def test_long_socket(self): def test_long_socket(self):
"""Test backing up a directory with long sockets in them """Test backing up a directory with long sockets in them
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment