[lintian] 01/01: r/harness: Handle scratch space dir being undef
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 398fc00b7bf0bd044393c5f04c1c05a59895d1b8
Author: Niels Thykier <niels@thykier.net>
Date: Mon Feb 9 22:09:29 2015 +0100
r/harness: Handle scratch space dir being undef
Signed-off-by: Niels Thykier <niels@thykier.net>
---
reporting/harness | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/reporting/harness b/reporting/harness
index ac3ca2d..847b93f 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -221,7 +221,6 @@ if (not $opt{'reports-only'}) {
my @lintian_harness_args = (
'--lintian-frontend', "$LINTIAN_ROOT/frontend/lintian",
'--lintian-log-dir', $LOG_DIR,
- '--lintian-scratch-space', $LINTIAN_SCRATCH_SPACE,
'--schedule-chunk-size', $opt{'schedule-chunk-size'},
'--schedule-limit-groups', $opt{'schedule-limit-groups'},
'--state-dir', $STATE_DIR,
@@ -236,6 +235,11 @@ if (not $opt{'reports-only'}) {
push(@sync_state_args, '--dry-run');
}
+ if ($LINTIAN_SCRATCH_SPACE) {
+ unshift(@lintian_harness_args,
+ '--lintian-scratch-space', $LINTIAN_SCRATCH_SPACE);
+ }
+
if ($USE_PERMANENT_LAB) {
unshift(@lintian_harness_args,
'--use-permanent-lab', '--lintian-lab', $LINTIAN_LAB);
@@ -255,9 +259,10 @@ if (not $opt{'reports-only'}) {
. (($? >> 8) & 0xff));
Log('Running running lintian (via reporting-lintian-harness)');
- Log("Command: "
- . join($dplint_cmd, 'reporting-lintian-harness',
- @lintian_harness_args));
+ Log(
+ "Command: "
+ . join(' ',
+ $dplint_cmd, 'reporting-lintian-harness',@lintian_harness_args));
my %harness_lintian_opts = (
'pipe_out' => FileHandle->new,
'err' => '&1',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: