Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=a3d2ea679159b013749d51fef917df980e160c86

commit a3d2ea679159b013749d51fef917df980e160c86
Author: crazy <[email protected]>
Date:   Sun May 21 10:36:37 2017 +0200

makepkg: check what pacman to use
prevent makepkg to break on switch to pacman upstream
.. well we could start to symlink stuff around again but I don't
want that ..

diff --git a/scripts/makepkg b/scripts/makepkg
index 44fda84..6d6e287 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -56,7 +56,15 @@ NODOCS=0
TREE=""
CACHEURL=""

-PACMAN="pacman-g2.static"
+
+## we don't want to break all chroots on switch
+if [[ -e /usr/bin/pacman-g2.static ]]; then
+       PACMAN="pacman-g2.static"
+else
+       ## upstream one
+       PACMAN="pacman.static"
+fi
+
PACMAN_OPTS=

# compat functions. these are useful if one would like to use makepkg outside
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to