From c33d1f986ed4c0ed8a944ada3030c1de51892290 Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Fri, 6 Sep 2013 18:14:51 +0100 Subject: [PATCH] Wrong arguments for die() call die() needs $LINENO as its first arg Change-Id: I7c8043dbeb55ec9ed566e7055a02c0a2993d0a8a --- lib/baremetal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/baremetal b/lib/baremetal index 8f6c3f1660..0eb852887f 100644 --- a/lib/baremetal +++ b/lib/baremetal @@ -291,7 +291,7 @@ function extract_and_upload_k_and_r_from_image() { out=$($BM_IMAGE_BUILD_DIR/bin/disk-image-get-kernel \ -x -d $TOP_DIR/files -o bm-deploy -i $file) if [ $? -ne 0 ]; then - die "Failed to get kernel and ramdisk from $file" + die $LINENO "Failed to get kernel and ramdisk from $file" fi XTRACE=$(set +o | grep xtrace) set +o xtrace @@ -439,9 +439,9 @@ function add_baremetal_node() { "$BM_FLAVOR_ROOT_DISK" \ "$mac_1" \ | grep ' id ' | get_field 2 ) - [ $? -eq 0 ] || [ "$id" ] || die "Error adding baremetal node" + [ $? -eq 0 ] || [ "$id" ] || die $LINENO "Error adding baremetal node" id2=$(nova baremetal-interface-add "$id" "$mac_2" ) - [ $? -eq 0 ] || [ "$id2" ] || die "Error adding interface to barmetal node $id" + [ $? -eq 0 ] || [ "$id2" ] || die $LINENO "Error adding interface to barmetal node $id" }