diff options
| author | dgaudet <dgaudet@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2006-11-13 03:08:21 +0000 |
|---|---|---|
| committer | dgaudet <dgaudet@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2006-11-13 03:08:21 +0000 |
| commit | 634cd36415848e85ecd5bb04b40d90969764c7b5 (patch) | |
| tree | 1a113267e4a8ef9a81642ba3cac41106b6b60125 | |
| parent | 42ef6287960db20160352a6641ba7c91dad503d7 (diff) | |
| download | rdiff-backup-634cd36415848e85ecd5bb04b40d90969764c7b5.tar.gz | |
Fix showstopper problem on OSX handling pre-1.1.6 rdiff-backup metadata.
(Patch from Andrew Ferguson.)
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@771 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -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): |