tazwok rev 231

Made sure version in WOK/SRC_WANTED/receipt match version in WOK/PACKAGE/receipt. Also make sure SRC_WANTED was unset in source_receipt function.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Feb 05 16:07:26 2011 +0000 (2011-02-05)
parents eb670d752922
children 96231de1f61b
files tazwok
line diff
     1.1 --- a/tazwok	Sat Feb 05 02:43:50 2011 +0000
     1.2 +++ b/tazwok	Sat Feb 05 16:07:26 2011 +0000
     1.3 @@ -424,6 +424,8 @@
     1.4  check_for_tarball()
     1.5  {
     1.6  	if [ "$SRC_WANTED" ]; then
     1.7 +		VERSION_SRCWANTED=$(grep  ^VERSION= $WOK/$SRC_WANTED/receipt | cut -d "=" -f2 | sed -e 's/"//g')
     1.8 +		[ "$VERSION" != "$VERSION_SRCWANTED" ] || return
     1.9  		if [ "$SOURCE" ]; then
    1.10  			tazwok get-src "$SRC_WANTED"  --target=$WOK/$PACKAGE/$SOURCE-$VERSION ${nounpack:+--nounpack} || return 1
    1.11  		else
    1.12 @@ -431,6 +433,7 @@
    1.13  		fi
    1.14  		return
    1.15  	fi
    1.16 +	
    1.17  	if [ "$WGET_URL" ]; then
    1.18  		report step "Checking for source tarball"
    1.19  			
    1.20 @@ -1156,7 +1159,7 @@
    1.21  	unset PACKAGE SOURCE VERSION EXTRAVERSION CATEGORY SHORT_DESC \
    1.22  		MAINTAINER WEB_SITE WGET_URL DEPENDS BUILD_DEPENDS WANTED \
    1.23  		PACKED_SIZE UNPACKED_SIZE COOK_OPT PROVIDE CONFIG_FILES TAGS \
    1.24 -		src _pkg DESTDIR CONFIG_SITE
    1.25 +		src _pkg DESTDIR SRC_WANTED CONFIG_SITE
    1.26  	. ${RECEIPT:-$PWD/receipt}
    1.27  }
    1.28