From: Zygo Blaxell <zblaxell@waya.furryterror.org>
Date: Sat, 9 Jan 2010 01:08:45 +0000 (-0500)
Subject: Work around new fileutils output
X-Git-Tag: dm6-0.20100514~33
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=commitdiff_plain;h=822747d401e3e4b3cdb1c86b7e4e531cbe8b3d5f

Work around new fileutils output

findutils now appends a redundant ".000000000" to the %T@ output.
I've apparently missed the window to get findutils to fix this, so
I've worked around it.
---

diff --git a/faster-dupemerge b/faster-dupemerge
index 833d7f2..de9cc79 100755
--- a/faster-dupemerge
+++ b/faster-dupemerge
@@ -537,7 +537,7 @@ end_merge:
 }
 
 while (<FIND>) {
-	my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?\d+) (\d+) (.+)\0$/so;
+	my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?[\d.]+) (\d+) (.+)\0$/so;
 	die "read error: $!\nLast input line was '$_'" unless defined($name);
 
 	print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;