[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/metadata.py

[dean gaudet]

CVSROOT:        /cvsroot/rdiff-backup
Module name:    rdiff-backup
Changes by:     dean gaudet <dgaudet>   06/11/13 03:08:21

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : metadata.py 

Log message:
        Fix showstopper problem on OSX handling pre-1.1.6 rdiff-backup metadata.
        (Patch from Andrew Ferguson.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/metadata.py?cvsroot=rdiff-backup&r1=1.26&r2=1.27

Patches:
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- CHANGELOG   12 Nov 2006 06:46:39 -0000      1.188
+++ CHANGELOG   13 Nov 2006 03:08:20 -0000      1.189
@@ -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)
 --------------------------
 

Index: rdiff_backup/metadata.py
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/metadata.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- rdiff_backup/metadata.py    5 Nov 2006 01:24:52 -0000       1.26
+++ rdiff_backup/metadata.py    13 Nov 2006 03:08:21 -0000      1.27
@@ -70,7 +70,8 @@
        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):