From: Zygo Blaxell <zblaxell@waya.furryterror.org>
Date: Sun, 14 Feb 2010 00:36:22 +0000 (-0500)
Subject: Fix "expected inode FOO, found BAR" warning message
X-Git-Tag: dm6-0.20100514~8
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=commitdiff_plain;h=f58c1c6b10b0d913ea800ad7440b52d12a89ac52

Fix "expected inode FOO, found BAR" warning message

FOO was passed through format_inode, BAR was not.  The behavior was
correct, but the message incorrectly suggested otherwise.
---

diff --git a/faster-dupemerge b/faster-dupemerge
index 44d0e91..ef86fbb 100755
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@ -405,7 +405,7 @@ incumbent_file:
 						}
 
 						if (format_inode($incumbent_dev, $incumbent_ino) ne $incumbent) {
-							warn "$incumbent_file: expected inode $incumbent, found $incumbent_dev:$incumbent_ino";
+							warn "$incumbent_file: expected inode $incumbent, found ".format_inode($incumbent_dev, $incumbent_ino);
 							$surprises++;
 							next incumbent_file;
 						}
@@ -426,7 +426,7 @@ candidate_file:
 							}
 
 							if (format_inode($candidate_dev, $candidate_ino) ne $candidate) {
-								warn "$candidate_file: expected inode $candidate, found $candidate_dev:$candidate_ino";
+								warn "$candidate_file: expected inode $candidate, found ".format_inode($candidate_dev, $candidate_ino);
 								$surprises++;
 								next candidate_file;
 							}