summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-15 19:58:40 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-15 19:58:43 +0100
commit9a6515f9f4fcf015b1205ff85de5f1bd25c16e57 (patch)
tree9523a5facc28eb47abd16b9870a0f9b8913688a2
parent647d68c0203a30956aa57a6378a42efdd6dc9268 (diff)
Test suite: tstunt/dpkg-parsechangelog: Do not complain if PERLLIB is empty.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog3
-rwxr-xr-xtests/tstunt/dpkg-parsechangelog2
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 34502bf..65ecda4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -271,7 +271,8 @@ dgit (1.1) unstable; urgency=medium
currently only be updated with an actual upload, ie dgit push.)
* Make warnings fatal in dpkg-repos-admin-debian, dgit-ssh-dispatch
(using setup_sigwarn).
- * Make warnings fatal in tstunt/dpkg-parsechangelog (directly).
+ * tstunt/dpkg-parsechangelog: Make warnings fatal (directly).
+ * tstunt/dpkg-parsechangelog: Do not complain if PERLLIB is empty.
* Test suite: Honour DGIT_TEST_DEBUG=''.
* With -DDDD, print out all gitcfg references (copious!)
* Fix a debug message in the obsolete sshpsql archive access driver.
diff --git a/tests/tstunt/dpkg-parsechangelog b/tests/tstunt/dpkg-parsechangelog
index ce2d66d..1abd00c 100755
--- a/tests/tstunt/dpkg-parsechangelog
+++ b/tests/tstunt/dpkg-parsechangelog
@@ -28,7 +28,7 @@ if (@ARGV) {
my $strip = $0;
$strip =~ s#/[^/]+$## or die "$0 ?";
foreach my $k (qw(PATH PERLLIB)) {
- my @opath = split /\:/, $ENV{$k};
+ my @opath = defined $ENV{$k} ? split /\:/, $ENV{$k} : ();
my @npath = grep { $_ ne $strip } @opath;
@npath != @opath or die "$0 $k $ENV{$k} ?";
$ENV{$k} = join ':', @npath;