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

[Ben Escoto]

Index: rdiff-backup/rdiff_backup/metadata.py
diff -u rdiff-backup/rdiff_backup/metadata.py:1.19 
rdiff-backup/rdiff_backup/metadata.py:1.20
--- rdiff-backup/rdiff_backup/metadata.py:1.19  Fri Nov  4 22:41:13 2005
+++ rdiff-backup/rdiff_backup/metadata.py       Sun Nov  6 01:46:54 2005
@@ -64,6 +64,7 @@
 
 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 @@
                 
                # 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