Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=48de1e9ae636763606904b51ccb3ef18ce51f427
commit 48de1e9ae636763606904b51ccb3ef18ce51f427 Author: Michel Hermier <[email protected]> Date: Wed Nov 28 13:44:10 2012 +0100 scripts/makepkg * Move CHROOTDIR check at makepkg.conf loading. diff --git a/scripts/makepkg b/scripts/makepkg index 71afc7f..205bc63 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -361,10 +361,6 @@ chroot_enter() { error "Building in a chroot as an unprivileged user is not possible." exit 1 fi - if [ "$CHROOTDIR" = "" ]; then - error "The CHROOTDIR environment variable is not defined." - exit 1 - fi CHROOTDIR="$CHROOTDIR/$TREE" mkdir -p $CHROOTDIR/{dev,etc,proc,sys,var/cache/pacman-g2,var/tmp/fst} @@ -1507,6 +1503,11 @@ makepkg_loadconfig() { # FIXME: Make BUILDSCRIPT a makepkg.conf variable BUILDSCRIPT="FrugalBuild" + if [ -z "$CHROOTDIR" ]; then + error "The CHROOTDIR environment variable is not defined." + exit 1 + fi + if [ -z "$PACKAGER" ]; then error "Please make sure that you edit /etc/makepkg.conf and set the PACKAGER= variable" exit 1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
