The following commit has been merged in the squeeze branch:
commit d3c66d3c73914793c6324ca002d744b874ca0219
Author: Raphael Geissert <[email protected]>
Date: Mon Feb 13 07:27:00 2012 +0000
debdiff: Don't treat extensionless files as if they were packages
Closes: #659559
Signed-off-by: Adam D. Barratt <[email protected]>
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index 980ef41..d6f6130 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -321,14 +321,11 @@ if (! $type) {
elsif ($ARGV[0] =~ /\.udeb$/) { $type = 'deb'; }
elsif ($ARGV[0] =~ /\.changes$/) { $type = 'changes'; }
elsif ($ARGV[0] =~ /\.dsc$/) { $type = 'dsc'; }
- elsif (`file $ARGV[0]` =~ /Debian/) { $type = 'deb'; }
else {
fatal "Could not recognise files; the names should end .deb, .udeb,
.changes or .dsc";
}
- if ($ARGV[1] !~ /\.$type$/) {
- unless ($type eq 'deb' and `file $ARGV[0]` =~ /Debian/) {
- fatal "The two filenames must have the same suffix, either .deb,
.udeb, .changes or .dsc";
- }
+ if ($ARGV[1] !~ /\.$type$/ && ($type ne 'deb' || $ARGV[1] !~ /\.udeb$/)) {
+ fatal "The two filenames must have the same suffix, either .deb, .udeb,
.changes or .dsc";
}
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
