# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1448851115 -7200
# Node ID c2c2d31406ccc4b2c53e5f2caf4093fdcacfe62f
# Parent  a2b90fc71cc917d59077ca2f5a9160b6bb788b01
cook: better handle implicit dependencies (again)

diff -r a2b90fc71cc9 -r c2c2d31406cc cook
--- a/cook	Mon Nov 30 04:21:20 2015 +0200
+++ b/cook	Mon Nov 30 04:38:35 2015 +0200
@@ -498,7 +498,7 @@
 			# Check the rest of errors, warnings and tips
 			_ 'QA: Checking %s...' "$(basename $desktop)"
 			diff "$desktop.orig" "$desktop"
-			desktop-file-validate "$desktop"
+			desktop-file-validate "$desktop" | busybox fold -s
 			echo
 		fi
 
@@ -634,8 +634,8 @@
 	[ -n "$root" ] && _ 'Using packages DB: %s' "$root$DB"
 	for dep in $BUILD_DEPENDS; do
 		implicit="${dep%-dev}"
-		# Don't add implicit dependency if it defined in BUILD_DEPENDS
-		echo '' $BUILD_DEPENDS '' | fgrep -q " $implicit " && implicit=''
+		# Don't add implicit dependency if it defined in DEPENDS
+		echo '' $DEPENDS '' | fgrep -q " $implicit " && implicit=''
 		for i in $dep $implicit; do
 			if [ ! -f "$root$INSTALLED/$i/receipt" ]; then
 				# Try local package first. In some cases implicit doesn't exist, ex: