test-dependencies, insane.bbclass: improve the message

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 55bfaf2d60f0066c10be22e28d988236cd620770..3dd2e7fb6acf9d356510a377874f7e54eda15446 100644 (file)
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -794,7 +794,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
                             break
                 if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps:
                     continue
-                error_msg = "%s rdepends on %s but its not a build dependency?" % (pkg, rdepend)
+                error_msg = "%s rdepends on %s, but it isn't a build dependency?" % (pkg, rdepend)
                 sane = package_qa_handle_error("build-deps", error_msg, d)
 
     return sane

diff --git a/scripts/test-dependencies.sh b/scripts/test-dependencies.sh
index ecbb710c6b288e095610a3eaab1516d628b16692..2bcc2ca4f663c5703a6f34fe44b598ce461c5c69 100755 (executable)
--- a/scripts/test-dependencies.sh
+++ b/scripts/test-dependencies.sh
@@ -244,9 +244,11 @@ compare_deps() {
     else
       missing_deps=
       for dep in ${max_deps}; do
-        echo "${min_deps}" | grep -q " ${dep} " || missing_deps="${missing_deps} ${dep}"
-        echo # to get rid of dots on last line
-        echo "WARN: ${recipe}: ${package} rdepends on ${dep} but its not a build dependency?" | tee -a ${OUTPUT_FILE}
+        if ! echo "${min_deps}" | grep -q " ${dep} " ; then
+          missing_deps="${missing_deps} ${dep}"
+          echo # to get rid of dots on last line
+          echo "WARN: ${recipe}: ${package} rdepends on ${dep}, but it isn't a build dependency?" | tee -a ${OUTPUT_FILE}
+        fi
       done
       if [ -n "${missing_deps}" ] ; then
         echo ${recipe} >> ${OUTPUTC}/failed-recipes.log