forked from ungleich-public/cdist
remove obsolete calls to set +e/-e
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
fe68c5b556
commit
74418c77e0
2 changed files with 1 additions and 8 deletions
|
@ -23,10 +23,5 @@
|
||||||
|
|
||||||
__cdist_run()
|
__cdist_run()
|
||||||
{
|
{
|
||||||
set +e
|
"$@" || __cdist_echo error "$1 exited non-zero, aborting."
|
||||||
"$@"
|
|
||||||
if [ "$?" -ne 0 ]; then
|
|
||||||
__cdist_echo error "$1 exited non-zero, aborting."
|
|
||||||
fi
|
|
||||||
set -e
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
__cdist_run_shell()
|
__cdist_run_shell()
|
||||||
{
|
{
|
||||||
set +e
|
|
||||||
# Prepend our path, so all cdist tools come before other tools
|
# Prepend our path, so all cdist tools come before other tools
|
||||||
PATH="${__cdist_out_type_bin_dir}:$PATH" sh -e "$@"
|
PATH="${__cdist_out_type_bin_dir}:$PATH" sh -e "$@"
|
||||||
if [ "$?" -ne 0 ]; then
|
if [ "$?" -ne 0 ]; then
|
||||||
|
@ -32,5 +31,4 @@ __cdist_run_shell()
|
||||||
cat "$1"
|
cat "$1"
|
||||||
__cdist_exit_err "Aborting due to non-zero exit code."
|
__cdist_exit_err "Aborting due to non-zero exit code."
|
||||||
fi
|
fi
|
||||||
set -e
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue