[SCM] Debian package checker branch, master, updated. 2.5.6-14-gdafa83e
The following commit has been merged in the master branch:
commit dafa83e58270308579070406b9bf44fad7788a8e
Author: Niels Thykier <niels@thykier.net>
Date: Sun Mar 18 14:25:16 2012 +0100
objdump-info: Use "fail" from Util.pm
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/collection/objdump-info b/collection/objdump-info
index 5b7f619..f3dd51e 100755
--- a/collection/objdump-info
+++ b/collection/objdump-info
@@ -26,6 +26,9 @@
use strict;
use warnings;
+use lib "$ENV{'LINTIAN_ROOT'}/lib/";
+use Util qw(fail);
+
my (undef, undef, $dir) = @ARGV;
my $failed = 0;
@@ -229,17 +232,6 @@ close OUT or fail("cannot write objdump-info: $!");
exit $failed;
-sub fail {
- if ($_[0]) {
- print STDERR "internal error: $_[0]\n";
- } elsif ($!) {
- print STDERR "internal error: $!\n";
- } else {
- print STDERR "internal error.\n";
- }
- exit 1;
-}
-
# Local Variables:
# indent-tabs-mode: nil
# cperl-indent-level: 4
diff --git a/debian/changelog b/debian/changelog
index 02cf818..33a1c6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,10 @@ lintian (2.5.7) UNRELEASED; urgency=low
* checks/scripts{,.desc}:
+ [NT] Remove old tags.
+ * collection/objdump-info:
+ + [NT] Use "fail" from Util.pm rather than embedding a copy of
+ it.
+
* frontend/lintian:
+ [JW] Fix typo in error message.
--
Debian package checker
Reply to: