# HG changeset patch # User Christopher Rogers # Date 1296922046 0 # Node ID ba5ba03929f9d67aa5ac877662de3ba0f722af85 # Parent eb670d752922e85dbbe257b83bdff7f99eea44e4 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. diff -r eb670d752922 -r ba5ba03929f9 tazwok --- a/tazwok Sat Feb 05 02:43:50 2011 +0000 +++ b/tazwok Sat Feb 05 16:07:26 2011 +0000 @@ -424,6 +424,8 @@ check_for_tarball() { if [ "$SRC_WANTED" ]; then + VERSION_SRCWANTED=$(grep ^VERSION= $WOK/$SRC_WANTED/receipt | cut -d "=" -f2 | sed -e 's/"//g') + [ "$VERSION" != "$VERSION_SRCWANTED" ] || return if [ "$SOURCE" ]; then tazwok get-src "$SRC_WANTED" --target=$WOK/$PACKAGE/$SOURCE-$VERSION ${nounpack:+--nounpack} || return 1 else @@ -431,6 +433,7 @@ fi return fi + if [ "$WGET_URL" ]; then report step "Checking for source tarball" @@ -1156,7 +1159,7 @@ unset PACKAGE SOURCE VERSION EXTRAVERSION CATEGORY SHORT_DESC \ MAINTAINER WEB_SITE WGET_URL DEPENDS BUILD_DEPENDS WANTED \ PACKED_SIZE UNPACKED_SIZE COOK_OPT PROVIDE CONFIG_FILES TAGS \ - src _pkg DESTDIR CONFIG_SITE + src _pkg DESTDIR SRC_WANTED CONFIG_SITE . ${RECEIPT:-$PWD/receipt} }