[oe-commits] Martin Jansa : testlab: match Package, Version, Archi, Depends, Recom only as first word on line

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 1d5e4efced897a3a5be9b44fb2a3abaaa44e951f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1d5e4efced897a3a5be9b44fb2a3abaaa44e951f

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Jun 19 06:47:09 2010 +0200

testlab: match Package,Version,Archi,Depends,Recom only as first word on line

* otherwise it will pick 'The' ie from line 'Description: The Enlightenment Window Manager Version 17' and mess installed-packages.txt
  fails: Version_shr-version_1.0-20100512-r0.4_om-gta02.ipk
  fails: The_e-wm_0.16.999.060+svnr48617-r13.4_armv4t.ipk
* this is also fix for missing entries in installed-package-sizes.txt
  (when find cannot find ipk files for messed package names)

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 classes/testlab.bbclass |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/testlab.bbclass b/classes/testlab.bbclass
index e6c9c8e..bc6b6e5 100644
--- a/classes/testlab.bbclass
+++ b/classes/testlab.bbclass
@@ -36,14 +36,14 @@ if [ -e  ${IMAGE_ROOTFS}/etc/opkg ] && [ "${ONLINE_PACKAGE_MANAGEMENT}" = "full"
 	echo -e "digraph depends {\n    node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot
 
 	for pkg in $(opkg-cl ${IPKG_ARGS} list_installed | awk '{print $1}') ; do 
-		opkg-cl ${IPKG_ARGS} info $pkg | awk '/Package/ {printf $2"_"} /Version/ {printf $2"_"} /Archi/ {print $2".ipk"}'  >> ${TESTLAB_DIR}/installed-packages.txt
+		opkg-cl ${IPKG_ARGS} info $pkg | awk '/^Package/ {printf $2"_"} /^Version/ {printf $2"_"} /^Archi/ {print $2".ipk"}'  >> ${TESTLAB_DIR}/installed-packages.txt
 
-    		for depends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep Depends) ; do 
-        		echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v Depends | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
+    		for depends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep ^Depends) ; do 
+        		echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v "$pkg OPP Depends" | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
     		done
     		
-		for recommends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep Recom) ; do
-        		echo "$pkg OPP $recommends [style=dotted];" | grep -v "(" | grep -v ")" | grep -v Recom | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
+		for recommends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep ^Recom) ; do
+        		echo "$pkg OPP $recommends [style=dotted];" | grep -v "(" | grep -v ")" | grep -v "$pkg OPP Recom" | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
     		done
 	done