Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/makechrootpkg.in
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-05-16 15:52:04 +0200
committerErich Eckner <git@eckner.net>2018-05-16 15:52:04 +0200
commitb1d319355e7189391baf890cc4a0900a458ee151 (patch)
treeb6522dd46dcefb7ffd69198a0f99d66d07f03392 /makechrootpkg.in
parente8deeede0860ae49dc1455e27a2fe5d588a2f249 (diff)
revert eab5aba9b027a7689acaf2382a04ff69b5b8771e - it does not work with sudo-1.8.23-1v20180516archlinux32/v20180516
Diffstat (limited to 'makechrootpkg.in')
-rw-r--r--makechrootpkg.in5
1 files changed, 2 insertions, 3 deletions
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")