Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f1d548fabfe07fd9d34a1e0b92f08ef04df44584
commit f1d548fabfe07fd9d34a1e0b92f08ef04df44584 Author: Michel Hermier <[email protected]> Date: Sun Nov 25 08:46:36 2012 +0100 scripts/makepkg * Move chrrot entering conditions into the function. diff --git a/scripts/makepkg b/scripts/makepkg index 5f0271d..881fb27 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -364,6 +364,9 @@ chroot_clean() } chroot_enter() { + if [ "$CHROOT" -ne 1 -o "$INCHROOT" -eq 1 ]; then + return 0 + fi if [ "`id -u`" != 0 ]; then error "Building in a chroot as an unprivileged user is not possible." exit 1 @@ -2013,10 +2016,7 @@ fi # some applications (eg, blackbox) will not build with some languages unset LC_ALL LANG # Build chroot environment if necessary. -if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then - chroot_enter -fi - +chroot_enter fakeroot_enter _P_build_date=`LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y"` _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
