[lintian] 01/01: harness: Remove all "*_log" variables from config
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit d2bf6ef8651ccc45f96fd044276054bd1224b8b4
Author: Niels Thykier <niels@thykier.net>
Date: Sun Sep 22 12:51:08 2013 +0200
harness: Remove all "*_log" variables from config
Signed-off-by: Niels Thykier <niels@thykier.net>
---
debian/changelog | 3 +++
reporting/config | 6 ------
reporting/harness | 6 ++++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fec3f6e..2284f9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ lintian (2.5.19) UNRELEASED; urgency=low
* reporting/{config,harness}:
+ [NT] Determine the html_reports command automatically
instead of allowing it to be configurable.
+ + [NT] Stop allowing config script to name individual
+ log files. The directory in which they are put is still
+ configurable.
-- Niels Thykier <niels@thykier.net> Sun, 22 Sep 2013 11:10:30 +0200
diff --git a/reporting/config b/reporting/config
index 923bba1..7f6eba7 100644
--- a/reporting/config
+++ b/reporting/config
@@ -29,13 +29,7 @@ $GRAPHS = 1;
# [today() - $GRAPHS_RANGE_DAYS ; now()]
$GRAPHS_RANGE_DAYS = 240;
-$log_file = "$LOG_DIR/harness.log";
-$changes_file = "$LOG_DIR/setup-lab.log";
-$list_file = "$LOG_DIR/changed-packages.list";
-$lintian_log = "$LOG_DIR/lintian.log";
-$old_lintian_log = "$LOG_DIR/lintian.log.old";
$lintian_cmd = "$LINTIAN_ROOT/frontend/lintian";
-$html_reports_log = "$LOG_DIR/html_reports.log";
$statistics_file = "$LOG_DIR/statistics";
1;
diff --git a/reporting/harness b/reporting/harness
index a6e6133..51bcd11 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -93,8 +93,6 @@ require './config'; ## no critic (Modules::RequireBarewordIncludes)
use vars qw($LINTIAN_ROOT $LINTIAN_LAB $LINTIAN_ARCHIVEDIR $LINTIAN_DIST
$LINTIAN_ARCH $LINTIAN_CFG
$lintian_cmd
- $log_file $lintian_log $old_lintian_log
- $html_reports_log
$LOG_DIR $statistics_file
$HTML_DIR $HTML_TMP_DIR $LINTIAN_BIN_DIR
$LINTIAN_AREA);
@@ -106,6 +104,10 @@ $ENV{'LINTIAN_LAB'} = $LINTIAN_LAB;
delete($ENV{'LINTIAN_ROOT'});
my $html_reports_cmd = "$LINTIAN_ROOT/reporting/html_reports";
+my ($log_file, $list_file, $lintian_log, $html_reports_log)
+ = map {"$LOG_DIR/$_" }
+ qw(harness.log changed-packages.list lintian.log html_reports.log);
+my $old_lintian_log = $lintian_log . '.old';
# import perl libraries
unshift @INC, "$LINTIAN_ROOT/lib";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: