From b1d319355e7189391baf890cc4a0900a458ee151 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 16 May 2018 15:52:04 +0200 Subject: revert eab5aba9b027a7689acaf2382a04ff69b5b8771e - it does not work with sudo-1.8.23-1 --- makechrootpkg.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'makechrootpkg.in') diff --git a/makechrootpkg.in b/makechrootpkg.in index 725a97c..08b9aac 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -206,7 +206,6 @@ EOF { printf '#!/bin/bash\n' declare -f _chrootbuild - declare -p SOURCE_DATE_EPOCH 2>/dev/null || true printf '_chrootbuild "$@" || exit\n' if [[ $run_namcap = true ]]; then @@ -233,7 +232,7 @@ _chrootbuild() { # use "$" in arguments to commands with "sudo -i". ${foo} or # ${1} is OK, but $foo or $1 isn't. # https://bugzilla.sudo.ws/show_bug.cgi?id=765 - sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@" + sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@" } _chrootnamcap() { @@ -345,7 +344,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 # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") -- cgit v1.2.3-70-g09d2