From 7ef33c51dbedbd6be0be23ad021dad96298b7c88 Mon Sep 17 00:00:00 2001 From: Tim Miller Date: Tue, 30 Apr 2013 19:36:37 -0700 Subject: [PATCH] Source img-functions into common-functions. A recent commit added a call to function cleanup_dirs to the common-functions file, but this function is not in scope for all code paths. The problem can be reproduced like so: bin/ramdisk-image-create deploy -o /tmp/foo Which results in the error: bin/../lib/common-functions: line 35: cleanup_dirs: command not found This change causes cleanup_dirs to be in scope when calling ramdisk-image-create. Change-Id: Iaf01beb9dd42a9d810d8aed1aa4ce19a5854c09b --- lib/common-functions | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/common-functions b/lib/common-functions index 37cb723b0..1cbf4ce85 100644 --- a/lib/common-functions +++ b/lib/common-functions @@ -13,6 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +source $(dirname $(readlink -f $BASH_SOURCE))/img-functions + function mk_build_dir () { export TMP_BUILD_DIR=$(mktemp -t -d --tmpdir=${TMP_DIR:-/tmp} image.XXXXXXXX) [ $? -eq 0 ] || die "Failed to create tmp directory"