diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-11-06 01:46:54 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2005-11-06 01:46:54 +0000 |
| commit | 6cab8d962f3f6f60dc7bb0410a482d8420d16175 (patch) | |
| tree | e5ca9e74e3d273e05ed9704797abc9e378b776be /rdiff-backup/rdiff_backup/metadata.py | |
| parent | 817becf1110537f03dcc51d9b66225971d98faa1 (diff) | |
| download | rdiff-backup-6cab8d962f3f6f60dc7bb0410a482d8420d16175.tar.gz | |
re-enable carbonfile default, ignore errors
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@674 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/metadata.py')
| -rw-r--r-- | rdiff-backup/rdiff_backup/metadata.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/metadata.py b/rdiff-backup/rdiff_backup/metadata.py index 0d7ba4f..04115d9 100644 --- a/rdiff-backup/rdiff_backup/metadata.py +++ b/rdiff-backup/rdiff_backup/metadata.py @@ -64,6 +64,7 @@ class ParsingError(Exception): def carbonfile2string(cfile): """Convert CarbonFile data to a string suitable for storing.""" + if not cfile: return "None" retvalparts = [] retvalparts.append('creator:%s' % binascii.hexlify(cfile['creator'])) retvalparts.append('type:%s' % binascii.hexlify(cfile['type'])) @@ -107,8 +108,7 @@ def RORP2Record(rorpath): # If there is Carbon data, save it. if rorpath.has_carbonfile(): - if not rorpath.get_carbonfile(): cfile = "None" - else: cfile = carbonfile2string(rorpath.get_carbonfile()) + cfile = carbonfile2string(rorpath.get_carbonfile()) str_list.append(" CarbonFile %s\n" % (cfile,)) # If file is hardlinked, add that information |