[oe-commits] Martin Jansa : test-dependencies, insane.bbclass: improve the message

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: b73e6159aed1a9768d02d12e7894ca0f1e72be69
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b73e6159aed1a9768d02d12e7894ca0f1e72be69

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Sat Aug  9 18:07:56 2014 +0200

test-dependencies, insane.bbclass: improve the message

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

---

 meta/classes/insane.bbclass  | 2 +-
 scripts/test-dependencies.sh | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 55bfaf2..3dd2e7f 100644
--- 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 ecbb710..2bcc2ca 100755
--- 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