From c27e32f76935592efa821ed6264968b89a2611da Mon Sep 17 00:00:00 2001
From: Gregory Haynes <greg@greghaynes.net>
Date: Mon, 27 Oct 2014 09:42:58 -0700
Subject: [PATCH] package-installs assumes packages have a pkg-map

Our package-installs script fails when installing a package which does
not have a pkg-map but a pkg-map file exist for the element.

Change-Id: I3dab802e23bccfc916efcc1c70c6ce6c4a9ccf67
---
 elements/package-installs/bin/package-installs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/elements/package-installs/bin/package-installs b/elements/package-installs/bin/package-installs
index b1dc1604..74eca24a 100755
--- a/elements/package-installs/bin/package-installs
+++ b/elements/package-installs/bin/package-installs
@@ -50,7 +50,12 @@ for PACKAGEFILE in $(find $WORKDIR -maxdepth 1 -name "package-installs-*" ); do
 
         if [ -e /usr/share/pkg-map/$element_name ]; then
             # map the package to its true name
-            pkg=$(pkg-map --element $element_name $pkg)
+            set +e
+            map_pkg=$(pkg-map --element $element_name $pkg)
+            if [ $? -eq 0 ]; then
+                pkg=$map_pkg
+            fi
+            set -e
         fi
 
         PACKAGES="$PACKAGES $pkg"