tazwok rev 483 4.3

Merge bugfixes from branch default
author Antoine Bodin <gokhlayeh@slitaz.org>
date Thu Apr 07 19:05:12 2011 +0200 (2011-04-07)
parents 1192edf7f0fb fb70a2fffb05
children bf25a03de4ff
files tazwok
line diff
     1.1 --- a/.hgtags	Thu Apr 07 18:51:35 2011 +0200
     1.2 +++ b/.hgtags	Thu Apr 07 19:05:12 2011 +0200
     1.3 @@ -24,3 +24,4 @@
     1.4  ff412a1044b097a7fb095d22081245fbcb00a187 4.2.7
     1.5  7e7265ac0dc0858705f369998a140298c753854b 4.2.8
     1.6  6860bdd720318dfe2cfd5d72b18ee694ffbd30d7 4.2.9
     1.7 +5092d208347191bb10a8f1a9d5412b5f451305e4 4.2.10
     2.1 --- a/tazwok	Thu Apr 07 18:51:35 2011 +0200
     2.2 +++ b/tazwok	Thu Apr 07 19:05:12 2011 +0200
     2.3 @@ -511,9 +511,10 @@
     2.4  check_for_tarball()
     2.5  {
     2.6  	[ "$WGET_URL" ] || return 0
     2.7 +	[ "$WANTED" ] || return 0
     2.8 +	report step "Checking for source tarball: $PACKAGE"
     2.9 +	local repack_src=$repack_src TARBALL=$TARBALL local nounpack=$nounpack
    2.10  	look_for_cookopt !unpack && nounpack=yes
    2.11 -	report step "Checking for source tarball: $PACKAGE"
    2.12 -	local repack_src=$repack_src TARBALL=$TARBALL
    2.13  	if [ "$repack_src" = yes ] && look_for_cookopt !repack_src; then
    2.14  			repack_src=no
    2.15  	fi
    2.16 @@ -548,13 +549,6 @@
    2.17  		return 0
    2.18  	fi
    2.19  
    2.20 -	# Untaring source if necessary. We don't need to extract source if
    2.21 -	# the package is built with a wanted source package.
    2.22 -	if [ "$WANTED" ]; then
    2.23 -		[ -d "$tmp_src" ] && rm -r $tmp_src
    2.24 -		return
    2.25 -	fi
    2.26 -
    2.27  	report step "Untaring source tarball"
    2.28  
    2.29  	# Log process.
    2.30 @@ -1094,7 +1088,7 @@
    2.31  	# Set $src for standard package and $_pkg variables.
    2.32  	set_src_path
    2.33  	set_pkg_path
    2.34 -	
    2.35 +
    2.36  	# Execute genpkg_rules, check package and copy generic files to build
    2.37  	# the package.
    2.38  	report step "Building $PACKAGE with the receipt"