Merge branch 'maint'

Conflicts:
	lib/libalpm/alpm.h
	lib/libalpm/trans.c

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index c8e987ca..36ac7280 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -395,7 +395,7 @@ run_pacman() {
 		if type -p sudo >/dev/null; then
 			cmd="sudo $cmd"
 		else
-			cmd="su -c '$cmd'"
+			cmd="su root -c '$cmd'"
 		fi
 	fi
 	eval "$cmd"