X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftstunt%2Fdpkg-parsechangelog;h=ce2d66dcab3c32b26f3578da9c26df57cddcaad9;hb=c7821c26c30b0a79658b626ee7f2a17f73cdc952;hp=f1e75a88fa14320ae047fbba03f8e83f8fa78769;hpb=417bcf4ea06b9e181c39734e121d9a32cf7cbb21;p=dgit.git

diff --git a/tests/tstunt/dpkg-parsechangelog b/tests/tstunt/dpkg-parsechangelog
index f1e75a88..ce2d66dc 100755
--- a/tests/tstunt/dpkg-parsechangelog
+++ b/tests/tstunt/dpkg-parsechangelog
@@ -18,11 +18,24 @@ $SIG{__WARN__} = sub { die $_[0]; }; # no use of system, so we avoid #793471
 
 my $infile = "debian/changelog";
 
+my @orgargv = @ARGV;
+
 if (@ARGV && $ARGV[0] =~ s/^-l//) {
     $infile = shift @ARGV;
 }
 
-die if @ARGV;
+if (@ARGV) {
+    my $strip = $0;
+    $strip =~ s#/[^/]+$## or die "$0 ?";
+    foreach my $k (qw(PATH PERLLIB)) {
+	my @opath = split /\:/, $ENV{$k};
+	my @npath = grep { $_ ne $strip } @opath;
+	@npath != @opath  or die "$0 $k $ENV{$k} ?";
+	$ENV{$k} = join ':', @npath;
+    }
+    die if $ENV{'DGIT_NO_TSTUNT_CLPARSE'}++;
+    exec 'dpkg-parsechangelog', @orgargv;
+}
 
 use strict;
 open C, $infile or die $!;