diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-06-21 02:48:34 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-06-21 02:48:34 +0000 |
| commit | 8b87d8f980a07873e54d60a6ff4a6b000d85c4e1 (patch) | |
| tree | 58239fdaf8feec1d4a1a397a1b8b7bc9ff1bf440 | |
| parent | ce7004a88c5c8378dc48c6bf47c968ad329a0d27 (diff) | |
| download | rdiff-backup-8b87d8f980a07873e54d60a6ff4a6b000d85c4e1.tar.gz | |
Final checkin for 0.11.5
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@322 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/TODO | 4 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/restore.py | 3 | ||||
| -rw-r--r-- | rdiff-backup/testing/regressiontest.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/rdiff-backup/TODO b/rdiff-backup/TODO index 7b401fb..e4abd1d 100644 --- a/rdiff-backup/TODO +++ b/rdiff-backup/TODO @@ -1,11 +1,11 @@ Make restores tolerant of missing files -Look into hard linking on windows - Added --include/--exclude options for restoring ---------[ 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 even have the backup files. (Andrew Bressen) diff --git a/rdiff-backup/rdiff_backup/restore.py b/rdiff-backup/rdiff_backup/restore.py index 43932be..0380450 100644 --- a/rdiff-backup/rdiff_backup/restore.py +++ b/rdiff-backup/rdiff_backup/restore.py @@ -381,7 +381,8 @@ class RestoreFile: def get_restore_fp(self): """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() for inc_diff in self.relevant_incs[1:]: log.Log("Applying patch %s" % (inc_diff.get_indexpath(),), 7) diff --git a/rdiff-backup/testing/regressiontest.py b/rdiff-backup/testing/regressiontest.py index b2192c1..7ae60f5 100644 --- a/rdiff-backup/testing/regressiontest.py +++ b/rdiff-backup/testing/regressiontest.py @@ -180,6 +180,8 @@ class IncrementTest1(unittest.TestCase): InternalBackup(1, 1, hldir.path, Local.rpout.path, current_time = 1) InternalBackup(1, 1, "testfiles/empty", Local.rpout.path, current_time = 10000) + (Globals.quoting_enabled, Globals.chars_to_quote, + Globals.quoting_char) = old_settings def test_long_socket(self): """Test backing up a directory with long sockets in them |