The following commit has been merged in the master branch:
commit 0a3e4c44856cbd4c929df6b64795429e6870690e
Author: Raphael Geissert <[email protected]>
Date: Tue Feb 14 23:11:12 2012 +0000
debdiff: Don't treat extensionless files as if they were packages
Closes: #659559
diff --git a/debian/changelog b/debian/changelog
index 3f71c41..0fa4797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ devscripts (2.11.4) UNRELEASED; urgency=low
* suspicious-source: Add inode/x-empty to whitelist of MIME types
(Closes: #659946).
+ [ Raphael Geissert ]
+ * debdiff: Remove undocumented feature treating extensionless files as if
+ they were packages (Closes: #659559)
+
-- Benjamin Drung <[email protected]> Wed, 15 Feb 2012 15:56:19 +0100
devscripts (2.11.3) unstable; urgency=low
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index fa0c367..a1afcd4 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].
