sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "package-installs assumes packages have a pkg-map"

Browse Source
This commit is contained in:
Jenkins 2014-10-28 00:15:19 +00:00 committed by Gerrit Code Review
commit dbe2846264
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/package-installs/bin/package-installs
View File

@ -50,7 +50,12 @@ for PACKAGEFILE in $(find $WORKDIR -maxdepth 1 -name "package-installs-*" ); do
if [ -e /usr/share/pkg-map/$element_name ]; then if [ -e /usr/share/pkg-map/$element_name ]; then
# map the package to its true name # 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 fi
PACKAGES="$PACKAGES $pkg" PACKAGES="$PACKAGES $pkg"