tazwok rev 502 4.3
Fixed tazwok merge.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Wed May 04 13:06:38 2011 +0000 (2011-05-04) |
parents | 7df2902ad4d7 |
children | 88800c1af28d |
files | tazwok |
line diff
1.1 --- a/tazwok Wed May 04 13:01:48 2011 +0000 1.2 +++ b/tazwok Wed May 04 13:06:38 2011 +0000 1.3 @@ -286,21 +286,6 @@ 1.4 fi 1.5 } 1.6 1.7 -<<<<<<< local 1.8 -======= 1.9 -check_for_pkg_in_wok() 1.10 -{ 1.11 - [ -f $WOK/$PACKAGE/receipt ] && return 1.12 - if [ "$undigest" ]; then 1.13 - [ -f "$SLITAZ_DIR/$SLITAZ_VERSION/wok/$PACKAGE/receipt" ] && return 1 1.14 - grep -q ^$PACKAGE$ $SLITAZ_DIR/$SLITAZ_VERSION/packages/packages.txt && return 1 1.15 - fi 1.16 - [ -f $WOK/$(whoprovide $PACKAGE)/receipt ] && return 1 1.17 - echo "Can't find $PACKAGE in wok or mirror" >&2 1.18 - return 2 1.19 -} 1.20 - 1.21 ->>>>>>> other 1.22 ######################################################################## 1.23 # TAZWOK CORE FUNCTIONS 1.24 ########################