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

commit 49bbbd39f294339cf597ab5e2ae1c16b8280a230
Author: Michel Hermier <[email protected]>
Date:   Sun Nov 25 09:04:57 2012 +0100

scripts/makepkg

* Creating the changelog and the up2date check is a parte of the sources
preparation and validation.

diff --git a/scripts/makepkg b/scripts/makepkg
index 881fb27..b96a3d1 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -1728,6 +1728,12 @@ makepkg_parseargs() {
}

makepkg_prepare_sources() {
+       # Generate the Changelog if necessary.
+       if [ "$GENSHA1" = "0" -a "$NOBUILD" = "0" ]; then
+               buildscript_create_changelog
+       fi
+
+       buildscript_up2date
sources_download

if [ "$NOVALIDATE" -eq 1 ]; then
@@ -2009,10 +2015,6 @@ if [ -f "$PKGDEST/${_P_package_archives["${pkgname}"]}" 
-a "$FORCE" = "0" -a "$G
fi
fi

-# Generate the Changelog if necessary.
-if [ "$GENSHA1" = "0" -a "$NOBUILD" = "0" ]; then
-       buildscript_create_changelog
-fi
# some applications (eg, blackbox) will not build with some languages
unset LC_ALL LANG
# Build chroot environment if necessary.
@@ -2027,8 +2029,6 @@ buildenv_depends_validate

cd $startdir

-buildscript_up2date
-
buildscript_estimation

makepkg_prepare_sources
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to