diff options
| author | Jonathan Bauer | 2018-04-16 11:30:31 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2018-04-16 11:30:31 +0200 |
| commit | f5a94045fc180e50625b7e4ebbb36a058e44cfc1 (patch) | |
| tree | cbc39d72aba796cae9f1d8880bbceced7dec1801 | |
| parent | [vbox-src] use xmlstarlet to handle placeholders (diff) | |
| download | mltk-f5a94045fc180e50625b7e4ebbb36a058e44cfc1.tar.gz mltk-f5a94045fc180e50625b7e4ebbb36a058e44cfc1.tar.xz mltk-f5a94045fc180e50625b7e4ebbb36a058e44cfc1.zip | |
[vbox-src] error handling for xmlstarlet wrappers
| -rwxr-xr-x | core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/init_core.inc | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/init_core.inc b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/init_core.inc index a1da3016..e55a956e 100755 --- a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/init_core.inc +++ b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/init_core.inc @@ -41,11 +41,17 @@ add_node() { PARENT="$(print_namespaced "x" "${PARENT}")" # create node and set the internal variable newnode to it # to then add the attributes to it + local ret xmlstarlet ed -L -N x="${VBOX_NAMESPACE}" \ -s "${PARENT}" -t elem -n "${NODE}" \ --var newnode '$prev' \ ${ATTRS_OPTS} \ "${TMPCONFIG}" + ret=$? + if [ "$ret" -ne 0 ]; then + writelog "${FUNCNAME[0]} failed with '$ret' for args: $@" + fi + return $ret } # set_attr <node_xpath> <attr> <value> set_attr() { @@ -54,25 +60,27 @@ set_attr() { cleanexit 1 fi if ! node_exists "$1"; then - writelog "Node $1 missing" add_node "${1%/*}" "${1##*/}" \ "$2=$3" else + local ret if ! attr_exists "$1" "$2"; then - writelog "Attr $2 of $1 missing" xmlstarlet ed -L -N x="${VBOX_NAMESPACE}" \ -i "$(print_namespaced "x" "$1")" \ -t attr -n "$2" -v "$3" \ "${TMPCONFIG}" - writelog "Returned with $?" + ret=$? else - writelog "Attr $2 exists" xmlstarlet ed -L -N x="${VBOX_NAMESPACE}" \ -u "$(print_namespaced "x" "$1")/@$2" \ -v "$3" \ "${TMPCONFIG}" - writelog "Returned with $?" + ret=$? + fi + if [ "$ret" -ne 0 ]; then + writelog "${FUNCNAME[0]} failed with '$ret' for args: $@" fi + return $ret fi } del_node() { @@ -80,9 +88,15 @@ del_node() { writelog "${FUNCNAME[0]} requires one arg, $# given." cleanexit 1 fi + local ret xmlstarlet ed -L -N x="${VBOX_NAMESPACE}" \ -d "$(print_namespaced "x" "$1")" \ "${TMPCONFIG}" + ret=$? + if [ "$ret" -ne 0 ]; then + writelog "${FUNCNAME[0]} failed with '$ret' for args: $@" + fi + return $ret } attr_exists() { if [ $# -ne 2 ]; then |