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

[SCM] Debian package checker branch, master, updated. 1.24.3-7-g463c668



The following commit has been merged in the master branch:
commit 463c6681cb7504d4df485aa9bee3c5f40d53a7b9
Author: Frank Lichtenheld <djpig@debian.org>
Date:   Sun Aug 10 15:19:36 2008 -0300

    frontend/lintian: Do not try to use fail() before the lintian libraries are loaded

diff --git a/debian/changelog b/debian/changelog
index dd572f9..e1953b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ lintian (1.24.4) UNRELEASED; urgency=low
   * checks/shared-libs.desc:
     + [RA] Clarify that shlibs-declares-dependency-on-other-package can be
       issued for a version mismatch.  (Closes: #494400)
+  
+  * frontend/lintian:
+    + [FL] Do not try to use fail() before the lintian libraries are
+      loaded.
 
  --
 
diff --git a/frontend/lintian b/frontend/lintian
index d40ffae..1aca34e 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -411,7 +411,7 @@ if ($LINTIAN_CFG) {
 # read configuration file
 if ($LINTIAN_CFG) {
     open(CFG, '<', $LINTIAN_CFG)
-	or fail("cannot open configuration file $LINTIAN_CFG for reading: $!");
+	or die("cannot open configuration file $LINTIAN_CFG for reading: $!");
     while (<CFG>) {
 	chop;
 	s/\#.*$//go;
@@ -435,7 +435,7 @@ if ($LINTIAN_CFG) {
 	} elsif (m/^\s*LINTIAN_ARCH\s*=\s*(.*\S)\s*$/i) {
 	    $LINTIAN_ARCH = $1;
 	} else {
-	    fail("syntax error in configuration file: $_","(Note, that the syntax of the configuration file has been changed\nwith Lintian v0.3.0. In most cases, you don't need a configuration\nfile anymore -- just remove it.)");
+	    die("syntax error in configuration file: $_","(Note, that the syntax of the configuration file has been changed\nwith Lintian v0.3.0. In most cases, you don't need a configuration\nfile anymore -- just remove it.)");
 	}
     }
     close(CFG);
@@ -529,7 +529,7 @@ if (defined($unpack_level)) {
     }
 }
 unless (($unpack_level == 0) or ($unpack_level == 1) or ($unpack_level == 2)) {
-    fail("bad unpack level $unpack_level specified");
+    die("bad unpack level $unpack_level specified");
 }
 
 $LINTIAN_UNPACK_LEVEL = $unpack_level;

-- 
Debian package checker


Reply to: