We should preserve hardlinks even when the destination file system does

not support them.


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@896 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

trunk/rdiff-backup/CHANGELOG

 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)

trunk/rdiff-backup/rdiff_backup/fs_abilities.py

@@ -188,7 +188,7 @@ class FSAbilities:
 			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):

trunk/rdiff-backup/rdiff_backup/metadata.py

@@ -116,7 +116,7 @@ def RORP2Record(rorpath):
 			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)