From f07e33a2e9169265260f430a609baefa131f614c Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Mon, 16 May 2016 11:00:43 +0100
Subject: [PATCH] Revert "Properly fail/trap in eval_run_d"
This reverts commit 0d1d6bec7c58b2f52e6e1932f58767a02c86068b.
This patch breaks tripleo-ci (the instack.qcow2 images is failing
to build) and was merged without passing CI.
Closes-Bug: #1582115
Change-Id: Ic4725ad0689c937fb4c8c792e1eaff5f4ea9ada9
---
lib/common-functions | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/lib/common-functions b/lib/common-functions
index 541f57964..0f1b25658 100644
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -113,15 +113,12 @@ function check_element () {
# $1 is the hook to run
# $2 is the regex to look for
function eval_run_d () {
- local run_output=$(mktemp)
- trap "rm -f $run_output; check_break after-error ${break_cmd:-bash}" ERR
- run_d $1 $run_output
- if grep -q "$2" $run_output; then
- local temp=$(grep "$2" $run_output)
- eval "$temp"
- fi
- rm $run_output
- trap - ERR
+ local TEMP=`run_d $1`
+ echo "$TEMP"
+ if [ `echo "$TEMP" | grep -s "$2"` ]; then
+ TEMP=`echo "$TEMP" | grep "$2"`
+ eval "$TEMP"
+ fi
}
# Usage: map_nbd $image
@@ -197,16 +194,9 @@ function cleanup_image_dir () {
# Run a directory of hooks outside the target (that is, no chrooting).
function run_d() {
check_element
- check_break before-$1 ${break_cmd:-bash}
+ check_break before-$1 bash
if [ -d ${TMP_HOOKS_PATH}/$1.d ] ; then
- if [ -n "$2" ]; then
- dib-run-parts ${TMP_HOOKS_PATH}/$1.d | tee $2
- if [[ $PIPESTATUS[0] != 0 ]]; then
- return 1
- fi
- else
- dib-run-parts ${TMP_HOOKS_PATH}/$1.d
- fi
+ dib-run-parts ${TMP_HOOKS_PATH}/$1.d
fi
check_break after-$1 bash
}