[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.0-54-g5c17922



The following commit has been merged in the master branch:
commit 5c17922d035789b6080dc9d40700a8711b752fba
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jun 15 18:01:22 2011 +0200

    Replaced fail with die in cases where Util was not loaded

diff --git a/debian/changelog b/debian/changelog
index 72b2c61..b3e4c87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -111,6 +111,9 @@ lintian (2.5.1) UNRELEASED; urgency=low
       Lintian will now always verify the checksums in changes files.
       The options will be accepted with a warning for now, but may
       be removed in a later release.  (Closes: #629453)
+    + [NT] Fixed an issue where fail was called before it was
+      available.  Thanks to Toby Corkindale for the report.
+      (Closes: #630560, LP: #797553)
 
   * lib/Lintian/Tags.pm:
     + [NT] Fixed a flaw in logic that gave incorrect results for
diff --git a/frontend/lintian b/frontend/lintian
index 13a729b..8190ac3 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -247,7 +247,7 @@ sub record_check_tags {
 sub record_check_tags_from_file {
     my ($option, $name) = @_;
     open(my $file, '<', $name)
-	or fail("failed to open $name: $!");
+	or die("failed to open $name: $!");
     my @tags;
     for my $line (<$file>) {
 	$line =~ s/^\s+//;
@@ -274,7 +274,7 @@ sub record_suppress_tags {
 sub record_suppress_tags_from_file {
     my ($option, $name) = @_;
     open(my $file, '<', $name)
-	or fail("failed to open $name: $!");
+	or die("failed to open $name: $!");
     for my $line (<$file>) {
 	$line =~ s/^\s+//;
 	$line =~ s/\s+$//;

-- 
Debian package checker


Reply to: