The following commit has been merged in the master branch:
commit 3e5031a5049686e75f7516888ef8e4b3e2c5f495
Author: James Vega <[email protected]>
Date: Tue Apr 19 23:00:23 2011 -0400
Make file show all matched file types instead of just the first.
Closes: #574155
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index cb9d717..b32c323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
devscripts (2.10.73) UNRELEASED; urgency=low
- * uscan: Use the correct path when repacking zip files. (Closes: #622889)
+ * uscan:
+ + Use the correct path when repacking zip files. (Closes: #622889)
+ + Make file show all matched file types instead of just the first.
+ (Closes: #574155)
-- James Vega <[email protected]> Tue, 19 Apr 2011 21:57:10 -0400
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 46a50ed..a8052b1 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1386,8 +1386,7 @@ EOF
}
if ($newfile_base =~ /\.(tar\.gz|tgz|tar\.bz2|tbz2?)$/) {
- my $filetype = `file $destdir/$newfile_base`;
- $filetype =~ s%^\.\./\Q$newfile_base\E: %%;
+ my $filetype = `file -b -k $destdir/$newfile_base`;
unless ($filetype =~ /compressed data/) {
warn "$progname warning: $destdir/$newfile_base does not appear to
be a compressed file;\nthe file command says: $filetype\nNot processing this
file any further!\n";
return 1;
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
