openstack/project-config
Code Issues Proposed changes

Drop tempfile workaround for aggregate bindep list

Browse Source 
Since support for using "-f -" to read a package list from stdin
is supported in bindep 0.1.0 and later, remove the hacky temporary
workaround which stashed it in a tempfile.

Change-Id: I02d153113a160028658e38828e113fcf02bc5ab1
This commit is contained in:
Jeremy Stanley 2016-03-28 14:03:18 +00:00
parent 1a5c2049aa
commit 678c1c81b5
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nodepool/elements/cache-bindep/install.d/50-cache-pkgs
View File

@ -43,13 +43,7 @@ if [ -f /usr/bin/apt-get ] ; then
done
fi
# TODO(fungi) once https://review.openstack.org/195201 appears in a bindep
# release, replace the next four lines with:
# PACKAGELIST=`echo "$PACKAGES" | /usr/bindep-env/bin/bindep -b -f - || true`
PACKAGESFILE=`mktemp`
echo "$PACKAGES" > $PACKAGESFILE
PACKAGELIST=`/usr/bindep-env/bin/bindep -b -f $PACKAGESFILE || true`
rm $PACKAGESFILE
PACKAGELIST=`echo "$PACKAGES" | /usr/bindep-env/bin/bindep -b -f - || true`
if [ -f /usr/bin/apt-get ] ; then
# --ignore-missing conflicts with set -e, so force it to be ok