diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2009-01-03 20:26:52 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2009-01-03 20:26:52 +0000 |
| commit | 7976fa4fe271017ae13f897968306cdd7d1641ea (patch) | |
| tree | decb1324ff8999dd3f9a82db3b58b182763b7131 /rdiff-backup/rdiff_backup/FilenameMapping.py | |
| parent | 0dbb9698b0d1441a91598993bf9aa5430003e6c8 (diff) | |
| download | rdiff-backup-7976fa4fe271017ae13f897968306cdd7d1641ea.tar.gz | |
Revert previous patch & hold it for the new development branch
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@992 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/FilenameMapping.py')
| -rw-r--r-- | rdiff-backup/rdiff_backup/FilenameMapping.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rdiff-backup/rdiff_backup/FilenameMapping.py b/rdiff-backup/rdiff_backup/FilenameMapping.py index 046a4be..8bb3951 100644 --- a/rdiff-backup/rdiff_backup/FilenameMapping.py +++ b/rdiff-backup/rdiff_backup/FilenameMapping.py @@ -85,17 +85,18 @@ def quote(path): """ QuotedPath = chars_to_quote_regexp.sub(quote_single, path) - if not Globals.escape_dos_devices and not Globals.escape_trailing_spaces: + if not Globals.must_escape_dos_devices \ + and not Globals.must_escape_trailing_spaces: return QuotedPath # Escape a trailing space or period (invalid in names on FAT32 under DOS, # Windows and modern Linux) - if Globals.escape_trailing_spaces: + if Globals.must_escape_trailing_spaces: if len(QuotedPath) and (QuotedPath[-1] == ' ' or QuotedPath[-1] == '.'): QuotedPath = QuotedPath[:-1] + \ "%s%03d" % (quoting_char, ord(QuotedPath[-1])) - if not Globals.escape_dos_devices: + if not Globals.must_escape_dos_devices: return QuotedPath # Escape first char of any special DOS device files even if filename has an |