cookutils rev 781
cook: better handle implicit dependencies (again)
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Mon Nov 30 04:38:35 2015 +0200 (2015-11-30) |
| parents | a2b90fc71cc9 |
| children | 29aeb6b8a708 |
| files | cook |
line diff
1.1 --- a/cook Mon Nov 30 04:21:20 2015 +0200 1.2 +++ b/cook Mon Nov 30 04:38:35 2015 +0200 1.3 @@ -498,7 +498,7 @@ 1.4 # Check the rest of errors, warnings and tips 1.5 _ 'QA: Checking %s...' "$(basename $desktop)" 1.6 diff "$desktop.orig" "$desktop" 1.7 - desktop-file-validate "$desktop" 1.8 + desktop-file-validate "$desktop" | busybox fold -s 1.9 echo 1.10 fi 1.11 1.12 @@ -634,8 +634,8 @@ 1.13 [ -n "$root" ] && _ 'Using packages DB: %s' "$root$DB" 1.14 for dep in $BUILD_DEPENDS; do 1.15 implicit="${dep%-dev}" 1.16 - # Don't add implicit dependency if it defined in BUILD_DEPENDS 1.17 - echo '' $BUILD_DEPENDS '' | fgrep -q " $implicit " && implicit='' 1.18 + # Don't add implicit dependency if it defined in DEPENDS 1.19 + echo '' $DEPENDS '' | fgrep -q " $implicit " && implicit='' 1.20 for i in $dep $implicit; do 1.21 if [ ! -f "$root$INSTALLED/$i/receipt" ]; then 1.22 # Try local package first. In some cases implicit doesn't exist, ex: