Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=91c632688ff0549e1609fefc1e8433891060f840
commit 91c632688ff0549e1609fefc1e8433891060f840 Author: Michel Hermier <[email protected]> Date: Sun Nov 25 11:27:29 2012 +0100 scripts/makepkg * Move some message around the code. diff --git a/scripts/makepkg b/scripts/makepkg index 8ff0bce..b4bea21 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1778,6 +1778,7 @@ makepkg_prepare_sources() { # chown all source files to root.root chown -R root.root $startdir/src fi + msg "Sources are ready." } makepkg_build() { @@ -1785,6 +1786,9 @@ makepkg_build() { return 0 fi + declare -gr _P_build_date=`LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y"` + msg "Making package: $pkgname $pkgver-$pkgrel (${_P_build_date})" + # use distcc if requested if [ "$DISTCC" = "y" ]; then buildenv_distcc @@ -1815,6 +1819,8 @@ makepkg_build() { _P_subpkgsfixes+=(_pkg_check_links) _P_subpkgsfixes+=(create_pkg) pkg_foreach "${_P_subpkgsfixes[@]}" + + msg "Finished making: $pkgname (`date`)" } # FIXME: This code rely on "$startdir/pkg/" path @@ -2022,9 +2028,6 @@ fi chroot_enter fakeroot_enter -_P_build_date=`LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y"` -msg "Making package: $pkgname $pkgver-$pkgrel (${_P_build_date})" - unset deplist makedeplist buildenv_depends_validate @@ -2034,7 +2037,6 @@ buildscript_estimation makepkg_prepare_sources if [ "$NOBUILD" = "1" ]; then - msg "Sources are ready." exit 0 else makepkg_build @@ -2055,8 +2057,5 @@ if [ "$RMDEPS" = "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then $SUDO $PACMAN $PACMAN_OPTS -R $makedeplist $deplist fi -msg "Finished making: $pkgname (`date`)" - install_pkg - -exit 0 +exit $? _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
