classes/buildhistory: fix error when no packages are installed
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Wed, 19 Jun 2013 16:53:06 +0000 (17:53 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 20 Jun 2013 12:10:46 +0000 (13:10 +0100)
"xargs -n1 basename" will execute basename even if there are no lines
piped into it, causing a "basename: missing operand" error if no
packages are installed, which will happen for the target portion of
buildtools-tarball.

(xargs' -r option could have been used here, but it is a GNU extension
and I thought it best to avoid that for the sake of future
interoperability).

(From OE-Core rev: 03d86123e9e804e62de38effd307f070d7863080)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/buildhistory.bbclass

index c8fd68c..36e7fe1 100644 (file)
@@ -319,7 +319,11 @@ buildhistory_get_installed() {
        list_installed_packages file | sort > $pkgcache
 
        cat $pkgcache | awk '{ print $1 }' > $1/installed-package-names.txt
-       cat $pkgcache | awk '{ print $2 }' | xargs -n1 basename > $1/installed-packages.txt
+       if [ -s $pkgcache ] ; then
+               cat $pkgcache | awk '{ print $2 }' | xargs -n1 basename > $1/installed-packages.txt
+       else
+               printf "" > $1/installed-packages.txt
+       fi
 
        # Produce dependency graph
        # First, filter out characters that cause issues for dot