tazwok rev 365 4.2.1

Automated merge with http://repos.slitaz.org/tazwok
author Antoine Bodin <gokhlayeh@slitaz.org>
date Fri Feb 25 00:18:52 2011 +0100 (2011-02-25)
parents 3eb1f4e6ba37 ac0c4dea6951
children d741a360a291
files tazwok
line diff
     1.1 --- a/tazwok	Thu Feb 24 16:00:59 2011 +0100
     1.2 +++ b/tazwok	Fri Feb 25 00:18:52 2011 +0100
     1.3 @@ -93,11 +93,7 @@
     1.4  	get_options_list="$get_options_list SLITAZ_DIR SLITAZ_VERSION undigest"
     1.5  	get_options
     1.6  
     1.7 -	if [ "$undigest" ]; then
     1.8 -		LOCAL_REPOSITORY=$SLITAZ_DIR/$undigest
     1.9 -	else
    1.10 -		LOCAL_REPOSITORY=$SLITAZ_DIR/$SLITAZ_VERSION
    1.11 -	fi
    1.12 +	LOCAL_REPOSITORY=$SLITAZ_DIR/${undigest:-$SLITAZ_VERSION}
    1.13  	
    1.14  	if ! [ "$save_dir" ]; then
    1.15  		if [ -f $LOCAL_REPOSITORY/tazwok.conf ] || [ -f $LOCAL_REPOSITORY/slitaz.conf ]; then
    1.16 @@ -442,6 +438,7 @@
    1.17  check_for_tarball()
    1.18  {
    1.19  	[ "$WGET_URL" ] || return 0
    1.20 +	look_for_cookopt !unpack && nounpack=yes
    1.21  	report step "Checking for source tarball: $PACKAGE"
    1.22  	local repack_src=$repack_src TARBALL=$TARBALL
    1.23  	if [ "$repack_src" = yes ] && look_for_cookopt !repack_src; then
    1.24 @@ -475,9 +472,10 @@
    1.25  		fi
    1.26  	fi
    1.27  	report end-step
    1.28 -	if [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$nounpack" ]; then
    1.29 +	if { [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$nounpack" ] ; } || \
    1.30 +	{ [ -f "$SOURCES_REPOSITORY/$TARBALL" ] && [ "$repack_src" != yes ] && [ "$nounpack" ] ; }; then
    1.31  		[ -d "$tmp_src" ] && rm -r $tmp_src
    1.32 -		return
    1.33 +		return 0
    1.34  	fi
    1.35  
    1.36  	# Untaring source if necessary. We don't need to extract source if