summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-10-19 02:45:24 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-10-19 02:45:24 +0000
commit83336648d07d3f8f2ca25377468faeeba77bfd6f (patch)
treeec9e5315311f620afafaa5d2f7efca6a76e8a005
parenta0e30bdc00ce9f72ec16588c365fb6113889f9d8 (diff)
downloadrdiff-backup-83336648d07d3f8f2ca25377468faeeba77bfd6f.tar.gz
Carbonfile now defaults to off
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@635 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG6
-rw-r--r--rdiff-backup/rdiff_backup/Globals.py3
-rw-r--r--rdiff-backup/rdiff_backup/Main.py6
3 files changed, 14 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index ce86c92..5233609 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -7,6 +7,12 @@ 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 dd5dc9b..710d79d 100644
--- a/rdiff-backup/rdiff_backup/Globals.py
+++ b/rdiff-backup/rdiff_backup/Globals.py
@@ -87,7 +87,8 @@ resource_forks_write = None
resource_forks_conn = None
# Like the above, but applies to MacOS Carbon Finder creator/type info.
-carbonfile_active = None
+# As of 1.0.2 this has defaulted to off because of bugs
+carbonfile_active = 0
carbonfile_write = None
carbonfile_conn = None
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py
index 7e475c1..62ce7fc 100644
--- a/rdiff-backup/rdiff_backup/Main.py
+++ b/rdiff-backup/rdiff_backup/Main.py
@@ -84,6 +84,7 @@ 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"
@@ -424,8 +425,13 @@ 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")