diff options
| -rw-r--r-- | rdiff-backup/CHANGELOG | 6 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/metadata.py | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index ab612d8..07e1ad0 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,3 +1,9 @@ +New in v1.1.7 (2006/11/12) +-------------------------- + +Fix showstopper problem on OSX handling pre-1.1.6 rdiff-backup metadata. +(Patch from Andrew Ferguson.) + New in v1.1.6 (2006/11/11) -------------------------- diff --git a/rdiff-backup/rdiff_backup/metadata.py b/rdiff-backup/rdiff_backup/metadata.py index 2a28281..cdd9257 100644 --- a/rdiff-backup/rdiff_backup/metadata.py +++ b/rdiff-backup/rdiff_backup/metadata.py @@ -70,7 +70,8 @@ def carbonfile2string(cfile): retvalparts.append('type:%s' % binascii.hexlify(cfile['type'])) retvalparts.append('location:%d,%d' % cfile['location']) retvalparts.append('flags:%d' % cfile['flags']) - retvalparts.append('createDate:%d' % cfile['createDate']) + try: retvalparts.append('createDate:%d' % cfile['createDate']) + except KeyError: log.Log("Writing pre-1.1.6 style metadata, without creation date", 9) return '|'.join(retvalparts) def string2carbonfile(data): |