Skip to content

Commit

Permalink
Merge branch 'bug_14560/on_error_rudder_upgrade_stops_without_error_m…
Browse files Browse the repository at this point in the history
…essage_pr' into branches/rudder/5.0
  • Loading branch information
Jenkins CI committed Nov 12, 2019
2 parents c084037 + 63a9e44 commit 5972c1d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions rudder-webapp/SOURCES/rudder-upgrade
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/bin/bash

set -e
set -eE

function anomaly_handler() {
echo ""
echo "ERROR: An error happened during the step: ${STEP}"
echo "ERROR: An error happened during the step: ${STEP} (l $1)"
echo "ERROR: The migration will now stop"
echo "ERROR: Please try to run /opt/rudder/bin/rudder-upgrade again"
}

trap anomaly_handler ERR INT TERM
trap 'anomaly_handler ${LINENO}' ERR INT TERM

#####################################################################################
# Copyright 2012 Normation SAS
Expand Down

0 comments on commit 5972c1d

Please sign in to comment.