From 492b582f7d31e2d60669f3cf073831ff7b2e0798 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 12 Aug 2017 21:16:24 +0100 Subject: [PATCH] add makepkg patch --- deploy.sh | 4 ++++ makepkg.patch | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 makepkg.patch diff --git a/deploy.sh b/deploy.sh index 03ca462..014abd5 100755 --- a/deploy.sh +++ b/deploy.sh @@ -2,4 +2,8 @@ set -e +patch /usr/bin/makepkg < makepkg.patch + puppet apply manifests/main.pp --modulepath=modules/ --verbose + +patch /usr/bin/makepkg -R < makepkg.patch diff --git a/makepkg.patch b/makepkg.patch new file mode 100644 index 0000000..1fce22d --- /dev/null +++ b/makepkg.patch @@ -0,0 +1,11 @@ +--- /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