diff options
Diffstat (limited to 'rdiff-backup/rdiff_backup/Main.py')
| -rw-r--r-- | rdiff-backup/rdiff_backup/Main.py | 10 |
1 files changed, 3 insertions, 7 deletions
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 |