[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/fs_abilitie...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/06/14 18:17:57

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : fs_abilities.py metadata.py 

Log message:
        We should preserve hardlinks even when the destination file system does
        not support them.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.274&r2=1.275
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/metadata.py?cvsroot=rdiff-backup&r1=1.28&r2=1.29

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -b -r1.274 -r1.275
--- CHANGELOG   14 Jun 2008 16:35:25 -0000      1.274
+++ CHANGELOG   14 Jun 2008 18:17:56 -0000      1.275
@@ -1,6 +1,9 @@
 New in v1.1.16 (????/??/??)
 ---------------------------
 
+Properly preserve hard links when the destination does not support them.
+Thanks to Andreas Olsson for noticing the problem. (Andrew Ferguson)
+
 Fix another case where rdiff-backup fails because it has insufficient
 permissions on a file it owns. Thanks to Peter Schuller for the test
 case. (Andrew Ferguson)

Index: rdiff_backup/fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- rdiff_backup/fs_abilities.py        13 Apr 2008 11:25:22 -0000      1.45
+++ rdiff_backup/fs_abilities.py        14 Jun 2008 18:17:57 -0000      1.46
@@ -188,7 +188,7 @@
                        if Globals.preserve_hardlinks != 0:
                                log.Log("Warning: hard linking not supported by 
filesystem "
                                                "at %s" % (self.root_rp.path,), 
3)
-                       self.hardlinks = 0
+                       self.hardlinks = None
                else: self.hardlinks = 1
 
        def set_fsync_dirs(self, testdir):

Index: rdiff_backup/metadata.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/metadata.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- rdiff_backup/metadata.py    10 Jul 2007 22:39:59 -0000      1.28
+++ rdiff_backup/metadata.py    14 Jun 2008 18:17:57 -0000      1.29
@@ -116,7 +116,7 @@
                        str_list.append("  CarbonFile %s\n" % (cfile,))
 
                # If file is hardlinked, add that information
-               if Globals.preserve_hardlinks:
+               if Globals.preserve_hardlinks != 0:
                        numlinks = rorpath.getnumlinks()
                        if numlinks > 1:
                                str_list.append("  NumHardLinks %s\n" % 
numlinks)