Compare commits

...

3 Commits

Author SHA1 Message Date
7a35039dad update_psa: when called with an argument, skip test for available
updates, executing 'git pull' in any case.
2022-06-16 15:49:34 +02:00
42fb74a041 deactivate some debug output 2022-06-16 15:49:00 +02:00
d69f767002 deactivate output 2022-06-16 15:48:11 +02:00
3 changed files with 19 additions and 13 deletions

View File

@ -85,21 +85,24 @@ if [ "${general_utils_sourced:-1}" = "1" ]; then # include only once
# if [ -z ${!1} ]; then # if [ -z ${!1} ]; then
# log_fatal "$1 not set" # log_fatal "$1 not set"
# fi # fi
log_debug "$1=${!1}" # log_debug "$1=${!1}"
:
} }
assert_d () { assert_d () {
# if [ ! -d ${!1} ]; then # if [ ! -d ${!1} ]; then
# log_fatal "$1 does not exist" # log_fatal "$1 does not exist"
# fi # fi
log_debug "$1=${!1}" # log_debug "$1=${!1}"
:
} }
assert_f () { assert_f () {
# if [ ! -f ${!1} ]; then # if [ ! -f ${!1} ]; then
# log_fatal "$1 does not exist" # log_fatal "$1 does not exist"
# fi # fi
log_debug "$1=${!1}" #log_debug "$1=${!1}"
:
} }
assert_a () { assert_a () {
@ -109,6 +112,7 @@ if [ "${general_utils_sourced:-1}" = "1" ]; then # include only once
# if [ $__len -eq 0 ]; then # if [ $__len -eq 0 ]; then
# log_fatal "$1 not set" # log_fatal "$1 not set"
# fi # fi
log_debug "$1=$__n" # log_debug "$1=$__n"
:
} }
fi fi

View File

@ -379,11 +379,11 @@ if [ ${read_config_sourced:-1} = "1" ]; then # include only once
${DC_PSA_DC_FILE##*${CUSTOMER_ID}/} \ ${DC_PSA_DC_FILE##*${CUSTOMER_ID}/} \
${OPKG_CMDS_PSA_FILE##*${CUSTOMER_ID}/}) ${OPKG_CMDS_PSA_FILE##*${CUSTOMER_ID}/})
log_debug "known json/ini/hex_files ->" # log_debug "known json/ini/hex_files ->"
for (( i=0; i < ${#KNOWN_FILES[@]}; ++i )); do # for (( i=0; i < ${#KNOWN_FILES[@]}; ++i )); do
tab=$'\t' # tab=$'\t'
log_debug "$tab$tab ${KNOWN_FILES[$i]}" # log_debug "$tab$tab ${KNOWN_FILES[$i]}"
done # done
log_debug "sanity of ${CUSTOMER_REPOSITORY_PATH} OK" log_debug "sanity of ${CUSTOMER_REPOSITORY_PATH} OK"
# compute version string for current (i.e. previous) version # compute version string for current (i.e. previous) version

View File

@ -28,11 +28,13 @@ collect_current_configuration () {
#done #done
} }
update_psa() { update_psa() { # calling with a parameter is used for testing
if [ $# -eq 0 ]; then
if ! updates_available; then # check for false alarm if ! updates_available; then # check for false alarm
update_psa_false_alarm "update requested, but no WAIT state detected" update_psa_false_alarm "update requested, but no WAIT state detected"
exit $? exit $EXITCODE
fi
fi fi
update_psa_activated # message to ISMAS update_psa_activated # message to ISMAS