From cc9f46de21b781b9ffbf990bf56777f2f307d128 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Tue, 19 Jun 2018 09:24:50 +0100 Subject: [PATCH] Update patch --- makepkg.patch | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/makepkg.patch b/makepkg.patch index 1fce22d..5663f31 100644 --- a/makepkg.patch +++ b/makepkg.patch @@ -1,11 +1,19 @@ ---- /usr/bin/makepkg 2017-07-04 10:29:39.000000000 +0100 -+++ makepkg.bak 2017-08-10 09:30:02.882437815 +0100 -@@ -2127,7 +2127,7 @@ if (( ! INFAKEROOT )); then - if (( EUID == 0 )); then - error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ - catastrophic damage to your system.")" "makepkg" -- exit 1 # $E_USER_ABORT -+ # exit 1 # $E_USER_ABORT - fi - else - if [[ -z $FAKEROOTKEY ]]; then +*** /usr/bin/makepkg 2018-05-29 09:10:22.097063834 +0100 +--- /usr/bin/makepkg.orig 2018-05-29 09:08:25.916705962 +0100 +*************** +*** 1403,1409 **** + if (( EUID == 0 )); then + error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ + catastrophic damage to your system.")" "makepkg" +! # exit $E_ROOT + fi + else + if [[ -z $FAKEROOTKEY ]]; then +--- 1403,1409 ---- + if (( EUID == 0 )); then + error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ + catastrophic damage to your system.")" "makepkg" +! exit $E_ROOT + fi + else + if [[ -z $FAKEROOTKEY ]]; then