[pacman-dev] [PATCH] makepkg: Move check for sudo into check_software function

[Eric Bélanger]

Signed-off-by: Eric Bélanger <snowmaniscool at gmail.com>
---
 scripts/makepkg.sh.in |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ebe010b..4e15d54 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1449,6 +1449,13 @@ check_software() {
 	# check for needed software
 	local ret=0
 
+	# check for sudo if we will need it during makepkg execution
+	if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then
+		if ! type -p sudo >/dev/null; then
+			warning "$(gettext "Sudo can not be found. Will use su to acquire root privileges.")"
+		fi
+	fi
+
 	# fakeroot - building as non-root user
 	if [[ $(check_buildenv fakeroot) = "y" ]] && (( EUID > 0 )); then
 		if ! type -p fakeroot >/dev/null; then
@@ -1898,13 +1905,6 @@ else
 	fi
 fi
 
-# check for sudo if we will need it during makepkg execution
-if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then
-	if ! type -p sudo >/dev/null; then
-		warning "$(gettext "Sudo can not be found. Will use su to acquire root privileges.")"
-	fi
-fi
-
 unset pkgname pkgbase pkgver pkgrel epoch pkgdesc url license groups provides
 unset md5sums replaces depends conflicts backup source install changelog build
 unset makedepends optdepends options noextract
-- 
1.7.5.4