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

[SCM] Debian package checker branch, master, updated. 2.5.11-98-g2d21d6a



The following commit has been merged in the master branch:
commit 2d21d6a744ee30e84a59d38c12dc5b091cdd6f1b
Author: Samuel Bronson <naesten@gmail.com>
Date:   Fri Jan 25 22:52:41 2013 +0100

    reporting: Clean up redundant (and incorrect) ENV usage
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/reporting/html_reports b/reporting/html_reports
index 5e6b2ee..09642f4 100755
--- a/reporting/html_reports
+++ b/reporting/html_reports
@@ -40,19 +40,14 @@ our ($LINTIAN_ROOT, $LINTIAN_LAB, $LINTIAN_ARCHIVEDIR, $LINTIAN_DIST,
      $GRAPHS_RANGE_DAYS, $GRAPHS, $LINTIAN_MIRROR_NAME);
 
 # Read the configuration.
-require './config';
+BEGIN { require './config'; }
 
 # The path to the mirror timestamp.
 our $LINTIAN_TIMESTAMP
     = "$LINTIAN_ARCHIVEDIR/project/trace/$LINTIAN_MIRROR_NAME";
 
-# FIXME: At least the lab should be a parameter to Read_pkglists rather
-# than an environment variable.
-$ENV{'LINTIAN_LAB'} = $LINTIAN_LAB;
-$ENV{'LINTIAN_ROOT'} = $LINTIAN_ROOT;
-
 # Import Lintian Perl libraries.
-use lib "$ENV{LINTIAN_ROOT}/lib";
+use lib "$LINTIAN_ROOT/lib";
 use Lintian::Data;
 use Lintian::Internal::FrontendUtil qw(split_tag);
 use Lintian::Lab;

-- 
Debian package checker


Reply to: