From 3ff1a9bb2cd0952bbd099f3780a990365c389bcf Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Wed, 19 Oct 2005 02:45:26 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'r1-0-1'. git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/tags/r1-0-1@637 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/CHANGELOG | 16 ---------------- rdiff-backup/rdiff_backup/Globals.py | 3 +-- rdiff-backup/rdiff_backup/Main.py | 10 +++------- rdiff-backup/rdiff_backup/rpath.py | 7 ------- rdiff-backup/testing/securitytest.py | 7 ------- 5 files changed, 4 insertions(+), 39 deletions(-) diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index 5233609..befe070 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,19 +1,3 @@ -New in v1.0.2 (????/??/??) --------------------------- - -Fix for bug 14545 which was introduced in version 1.0.1: Quoting -caused a spurious security violation. (Important for Mac OS X) - -An error reading carbonfile data on Mac OS X should no longer cause a -crash. (Thanks to Kevin Horton for testing.) - -Carbonfile support now defaults to off, even if the system appears to -support it. It can be manually enabled with the --carbonfile switch. -If you know something about Mac OS X and want to look at the -carbonfile code so it can be re-enabled by default, please do so :) -(help available from list) - - New in v1.0.1 (2005/09/10) -------------------------- diff --git a/rdiff-backup/rdiff_backup/Globals.py b/rdiff-backup/rdiff_backup/Globals.py index 710d79d..dd5dc9b 100644 --- a/rdiff-backup/rdiff_backup/Globals.py +++ b/rdiff-backup/rdiff_backup/Globals.py @@ -87,8 +87,7 @@ resource_forks_write = None resource_forks_conn = None # Like the above, but applies to MacOS Carbon Finder creator/type info. -# As of 1.0.2 this has defaulted to off because of bugs -carbonfile_active = 0 +carbonfile_active = None carbonfile_write = None carbonfile_conn = None diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py index 62ce7fc..db0295d 100644 --- a/rdiff-backup/rdiff_backup/Main.py +++ b/rdiff-backup/rdiff_backup/Main.py @@ -84,7 +84,6 @@ def parse_cmdlineoptions(arglist): for opt, arg in optlist: if opt == "-b" or opt == "--backup-mode": action = "backup" elif opt == "--calculate-average": action = "calculate-average" - elif opt == "--carbonfile": Globals.set("carbonfile_active", 1) elif opt == "--check-destination-dir": action = "check-destination-dir" elif opt == "--compare" or opt == "--compare-at-time": action = "compare" @@ -425,13 +424,8 @@ def backup_set_fs_globals(rpin, rpout): update_triple(src_fsa.resource_forks, dest_fsa.resource_forks, ('resource_forks_active', 'resource_forks_write', 'resource_forks_conn')) - update_triple(src_fsa.carbonfile, dest_fsa.carbonfile, ('carbonfile_active', 'carbonfile_write', 'carbonfile_conn')) - if src_fsa.carbonfile and not Globals.carbonfile_active: - Log("Source may have carbonfile support, but support defaults to " - "off.\n Use --carbonfile to enable.", 5) - if Globals.never_drop_acls and not Globals.acls_active: Log.FatalError("--never-drop-acls specified, but ACL support\n" "disabled on destination filesystem") @@ -441,7 +435,9 @@ def backup_set_fs_globals(rpin, rpout): SetConnections.UpdateGlobal('fsync_directories', dest_fsa.fsync_dirs) SetConnections.UpdateGlobal('change_ownership', dest_fsa.ownership) SetConnections.UpdateGlobal('chars_to_quote', dest_fsa.chars_to_quote) - if Globals.chars_to_quote: FilenameMapping.set_init_quote_vals() + if Globals.chars_to_quote: + for conn in Globals.connections: + conn.FilenameMapping.set_init_quote_vals() def backup_touch_curmirror_local(rpin, rpout): """Make a file like current_mirror.time.data to record time diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py index 95dd54f..b9e84ca 100644 --- a/rdiff-backup/rdiff_backup/rpath.py +++ b/rdiff-backup/rdiff_backup/rpath.py @@ -1145,18 +1145,11 @@ class RPath(RORPath): self.data['carbonfile'] = cfile return cfile except MacOS.Error: - log.Log("Cannot read carbonfile information from %s" % - (self.path,), 2) self.data['carbonfile'] = None return self.data['carbonfile'] def write_carbonfile(self, cfile): """Write new carbon data to self.""" - if not cfile: - # This should be made cleaner---if you know Mac OS X tell - # me what could cause an error in get_carbonfile above - return - log.Log("Writing carbon data to %s" % (self.index,), 7) from Carbon.File import FSSpec import MacOS diff --git a/rdiff-backup/testing/securitytest.py b/rdiff-backup/testing/securitytest.py index 4c566dc..cd83635 100644 --- a/rdiff-backup/testing/securitytest.py +++ b/rdiff-backup/testing/securitytest.py @@ -200,13 +200,6 @@ class SecurityTest(unittest.TestCase): output = rpath.RPath(Globals.local_connection, 'testfiles/output') assert not output.lstat() - def test_quoting_bug(self): - """Test for bug 14545 --- quoting causes bad violation""" - Myrm('testfiles/output') - self.secure_rdiff_backup('testfiles/various_file_types', - 'testfiles/output', 1, '', - extra_args = '--override-chars-to-quote e') - if __name__ == "__main__": unittest.main() -- cgit v1.2.1