Fix "expected inode FOO, found BAR" warning message
authorZygo Blaxell <zblaxell@waya.furryterror.org>
Sun, 14 Feb 2010 00:36:22 +0000 (19:36 -0500)
committerZygo Blaxell <zblaxell@waya.furryterror.org>
Sun, 14 Feb 2010 00:36:22 +0000 (19:36 -0500)
FOO was passed through format_inode, BAR was not.  The behavior was
correct, but the message incorrectly suggested otherwise.

faster-dupemerge

index 44d0e91a929c361059b4e5a7df6f0ed6252d4699..ef86fbb4898306a0d0805cf49679c3758424120e 100755 (executable)
@@ -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;
                                                        }