From 678c1c81b5815753b9b796d16bf0a4738c825553 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 28 Mar 2016 14:03:18 +0000 Subject: [PATCH] Drop tempfile workaround for aggregate bindep list 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 --- nodepool/elements/cache-bindep/install.d/50-cache-pkgs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nodepool/elements/cache-bindep/install.d/50-cache-pkgs b/nodepool/elements/cache-bindep/install.d/50-cache-pkgs index 18c3745748..b31a867a91 100755 --- a/nodepool/elements/cache-bindep/install.d/50-cache-pkgs +++ b/nodepool/elements/cache-bindep/install.d/50-cache-pkgs @@ -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