cookutils rev 202
cook: exit on missing bdep
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sun May 22 13:41:14 2011 +0200 (2011-05-22) |
parents | 79ea2bf81b33 |
children | b17298f26bac |
files | cook |
line diff
1.1 --- a/cook Sun May 22 04:41:35 2011 +0200 1.2 +++ b/cook Sun May 22 13:41:14 2011 +0200 1.3 @@ -459,13 +459,13 @@ 1.4 cd $PKGS && tazpkg install $i-$vers.tazpkg >/dev/null 1.5 else 1.6 if [ "$vers" ]; then 1.7 - if grep -q ^$i-$vers.tazpkg $DB/packages.list; then 1.8 + if fgrep -q $i-$vers $DB/packages.list; then 1.9 gettext "Installing dep (web/cache):"; echo " $i $vers" 1.10 tazpkg get-install $i >/dev/null 1.11 else 1.12 # So package exist in wok but not available. 1.13 - # FIXME: if we exit previews bdeps are not removed. 1.14 - gettext "Missing dep:" ; echo " $i $vers" 1.15 + #cook $i || echo -n "ERROR: missing dep: $i $vers" 1.16 + echo -n "ERROR: missing dep: $i $vers" 1.17 fi 1.18 fi 1.19 fi 1.20 @@ -479,6 +479,11 @@ 1.21 busybox diff installed.list installed.cook > installed.cook.diff 1.22 deps=$(cat installed.cook.diff | grep ^+[a-zA-Z0-9] | wc -l) 1.23 1.24 + # QA: Exit on missing dep error. 1.25 + if fgrep -q ERROR: $LOGS/$pkg.log; then 1.26 + exit 1 1.27 + fi 1.28 + 1.29 # Get source tarball and make sure we have source dir named: 1.30 # $PACKAGE-$VERSION to be standard in receipts. Here we use tar.lzma 1.31 # tarball if it exists.