Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8947f05d89615d985a129c8e9073233ba93b46c2
commit 8947f05d89615d985a129c8e9073233ba93b46c2
Author: Michel Hermier <herm...@frugalware.org>
Date: Tue Mar 18 08:46:55 2014 +0100
makepkg: Installing requires --sudo, giving us the opportunity to vectorise
code.
Even if we check permissions before attempting an install, any install
requires --sudo option.
diff --git a/scripts/makepkg b/scripts/makepkg
index 4fc5d29..e4342e6 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -212,19 +212,7 @@ handledeps() {
fi
if [ "$deplist" != "" -a $haveperm -eq 1 ]; then
- if [ "$DEP_BIN" = "1" ]; then
- # install missing deps from binary packages (using
pacman-g2 -S)
- msg "Installing missing dependencies..."
- if [ "$INCHROOT" != "1" -o "`check_option SCRIPTLET`"
]; then
- makepkg pacman-g2 -- -D $deplist
- else
- makepkg pacman-g2 -- --noscriptlet -D $deplist
- fi
- if [ "$?" = "127" ]; then
- error "Failed to install missing dependencies."
- exit 1
- fi
- elif [ "$DEP_SUDO" = "1" ]; then
+ if [ "$DEP_BIN" = "1" -o "$DEP_SUDO" = "1" ]; then
# install missing deps from binary packages (using pacman-g2 -S and sudo)
msg "Installing missing dependencies..."
if [ "$INCHROOT" != "1" -o "`check_option SCRIPTLET`" ]; then
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
