From 05f7cb479e1c0f83fa1f1ae451f0c0c654798279 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 9 Mar 2017 01:17:44 +0100
Subject: [PATCH] mkchrootpkg: backport arch devtools changes

---
 bin/mkchrootpkg.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/mkchrootpkg.in b/bin/mkchrootpkg.in
index 4a7ff9a..ab304b1 100644
--- a/bin/mkchrootpkg.in
+++ b/bin/mkchrootpkg.in
@@ -213,7 +213,6 @@ prepare_chroot() {
     done
 
     cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF
-Defaults env_keep += "HOME"
 builduser ALL = NOPASSWD: /usr/bin/pacman
 EOF
     chmod 440 "$copydir/etc/sudoers.d/builduser-pacman"
@@ -276,6 +275,12 @@ move_products() {
     for pkgfile in "$copydir"/pkgdest/*; do
         chown "$src_owner" "$pkgfile"
         mv "$pkgfile" "$PKGDEST"
+
+        # Fix broken symlink because of temporary chroot PKGDEST /pkgdest
+        if [[ "$PWD" != "$PKGDEST" && -L "$PWD/${pkgfile##*/}" ]]; then
+            rm "$PWD/${pkgfile##*/}"
+            ln -sf "$PKGDEST/${pkgfile##*/}"
+        fi
     done
 
     for l in "$copydir"/logdest/*; do