Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=6cee2a8ccc0aa9ca34fb24a60ee68d3ebf78db80
commit 6cee2a8ccc0aa9ca34fb24a60ee68d3ebf78db80 Author: Michel Hermier <[email protected]> Date: Wed Nov 21 20:49:13 2012 +0100 scripts/makepkg * Re-order chroot_* functions no other change. diff --git a/scripts/makepkg b/scripts/makepkg index 297ab7c..d5ac4e3 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -362,18 +362,19 @@ usage() { $ECHO " --gzip Use gzip compression for a package" } -chroot_umount() { - msg "Attempting to umount chroot directories..." - umount $CHROOTDIR/proc >/dev/null - umount $CHROOTDIR/sys >/dev/null - umount $CHROOTDIR/dev >/dev/null - umount $CHROOTDIR/var/cache/pacman-g2 >/dev/null - umount $CHROOTDIR/var/cache/ccache/$pkgname >/dev/null - if [ "$?" != "0" ]; then - error "An error occurred while attempting to umount chroot directories." - exit 1 - fi - msg "Successfully umounted chroot directories." +chroot_lock() { + if [ -e $CHROOTDIR/var/tmp/fst/lock -a -d /proc/$(cat $CHROOTDIR/var/tmp/fst/lock 2>/dev/null) ]; then + error "Process $(cat $CHROOTDIR/var/tmp/fst/lock) is already building in this chroot." + plain "If you know what you are doing, you" + plain "can remove $CHROOTDIR/var/tmp/fst/lock." + exit 1 + else + echo $$ >$CHROOTDIR/var/tmp/fst/lock + fi +} + +chroot_unlock() { + rm -f $CHROOTDIR/var/tmp/fst/lock $_F_makepkg_pacconf } chroot_mount() { @@ -391,19 +392,18 @@ chroot_mount() { msg "Successfully mounted chroot directories." } -chroot_lock() { - if [ -e $CHROOTDIR/var/tmp/fst/lock -a -d /proc/$(cat $CHROOTDIR/var/tmp/fst/lock 2>/dev/null) ]; then - error "Process $(cat $CHROOTDIR/var/tmp/fst/lock) is already building in this chroot." - plain "If you know what you are doing, you" - plain "can remove $CHROOTDIR/var/tmp/fst/lock." - exit 1 - else - echo $$ >$CHROOTDIR/var/tmp/fst/lock - fi -} - -chroot_unlock() { - rm -f $CHROOTDIR/var/tmp/fst/lock $_F_makepkg_pacconf +chroot_umount() { + msg "Attempting to umount chroot directories..." + umount $CHROOTDIR/proc >/dev/null + umount $CHROOTDIR/sys >/dev/null + umount $CHROOTDIR/dev >/dev/null + umount $CHROOTDIR/var/cache/pacman-g2 >/dev/null + umount $CHROOTDIR/var/cache/ccache/$pkgname >/dev/null + if [ "$?" != "0" ]; then + error "An error occurred while attempting to umount chroot directories." + exit 1 + fi + msg "Successfully umounted chroot directories." } chroot_clean() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
