tape-admin: improve handling of function return codes

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
2018-12-31 03:38:09 +01:00
parent e3e8fb0f5d
commit 87471754ba

View File

@@ -1082,7 +1082,11 @@ mount_tape () {
mtx_unload mtx_unload
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
mount_tape "${mediapool_name}" "${volume_name}" mount_tape "${mediapool_name}" "${volume_name}"
return 0 if [ $? -eq 0 ]; then
return 0
else
return $?
fi
else else
return $? return $?
fi fi
@@ -1090,7 +1094,9 @@ mount_tape () {
else else
# mount new tape # mount new tape
get_slot ${mediapool_name} ${volume_name} get_slot ${mediapool_name} ${volume_name}
mtx_load ${volume_slot} if [ $? -eq 0 ]; then
mtx_load ${volume_slot}
fi
fi fi
# volume_name is member of given mediapool # volume_name is member of given mediapool
@@ -1116,8 +1122,16 @@ mount_tape () {
if [ $verbose -ge 1 ]; then if [ $verbose -ge 1 ]; then
printf "${MAGENTA}Tape is bocked via RetensionDate.\n" printf "${MAGENTA}Tape is bocked via RetensionDate.\n"
fi fi
ltfs_mount get_poolmember_next "${mediapool_name}"
return 0 if test $? -eq 0; then
if [ $verbose -ge 2 ]; then
printf "${MAGENTA}MediaPool: ${GREEN}%s${NO_COLOR} (using next tape: ${GREEN}%s${NO_COLOR})\n" \
"${mediapool_name}" "${volume_name_next}"
fi
# recurse all over again
mount_tape "${mediapool_name}" "${volume_name_next}"
return 0
fi
fi fi
fi fi
if [ ${volume_mediapolicy} = "overwrite" ] ; then if [ ${volume_mediapolicy} = "overwrite" ] ; then