summaryrefslogtreecommitdiff
path: root/pkgtools/lintpkgsrc
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2022-08-14 03:18:36 +0000
committerrillig <rillig@pkgsrc.org>2022-08-14 03:18:36 +0000
commit713a6f455dc6696f699019e35b196214deaba4dc (patch)
tree1e3af6e6c4eb75d35deb554412d66043ca2c3ccc /pkgtools/lintpkgsrc
parentc07de424659ab72703d7a7e819f1514f65e48d12 (diff)
downloadpkgsrc-713a6f455dc6696f699019e35b196214deaba4dc.tar.gz
lintpkgsrc: properly clean up after chdir
When running 'lintpkgsrc -I tmp/lp-85 -yro', lintpkgsrc couldn't find the cache file due to the intermediate chdir($pkgdistdir).
Diffstat (limited to 'pkgtools/lintpkgsrc')
-rwxr-xr-xpkgtools/lintpkgsrc/files/lintpkgsrc.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
index cbfef5648ce..d94dcbb31e7 100755
--- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
+++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
@@ -1,5 +1,5 @@
#!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.90 2022/08/14 03:12:02 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.91 2022/08/14 03:18:36 rillig Exp $
# Written by David Brownlee <abs@netbsd.org>.
#
@@ -1191,6 +1191,7 @@ sub scan_pkgsrc_distfiles_vs_distinfo($pkgsrcdir, $pkgdistdir, $check_unref,
}
verbose("checksum mismatches\n");
+ my $prev_cwd = getcwd() or die;
chdir_or_fail($pkgdistdir);
foreach my $sum (keys %sumfiles) {
if ($sum eq 'Size') {
@@ -1225,7 +1226,7 @@ sub scan_pkgsrc_distfiles_vs_distinfo($pkgsrcdir, $pkgdistdir, $check_unref,
waitpid($pid, 0) || fail "xargs digest $sum";
waitpid($pid2, 0) || fail 'pipe write to xargs';
}
- chdir_or_fail('/'); # Do not want to stay in $pkgdistdir
+ chdir_or_fail($prev_cwd);
}
sort keys %unref_distfiles;