diff options
| author | Matt Robinson <git@nerdoftheherd.com> | 2019-03-16 11:29:59 +0000 |
|---|---|---|
| committer | Levente Polyak <anthraxx@archlinux.org> | 2019-03-25 23:32:13 +0100 |
| commit | 155798b8b12224bc09b4349edf8259ead301740f (patch) | |
| tree | 2d9bdfd874a34475e247930c696fdf1bc726e059 | |
| parent | d9b73504484da7e185dc590ef13d5f31942f6051 (diff) | |
| download | devtools32-155798b8b12224bc09b4349edf8259ead301740f.tar.xz | |
makechrootpkg: keep *DEST, MAKEFLAGS & PACKAGER
If makechrootpkg is called as non-root, the {SRC,SRCPKG,PKG,LOG}DEST,
MAKEFLAGS and PACKAGER environment variables are lost in the call to
check_root().
Add these to the passed keepenv list so that they are preserved instead.
| -rw-r--r-- | makechrootpkg.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 4b72a36..dc647b3 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -341,7 +341,7 @@ main() { [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.' makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}} - check_root SOURCE_DATE_EPOCH,GNUPGHOME + check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") |