fixup! Fix #1682 : Improve UX of graceful shutdown message - base scr…

…ipts : catch error code of action lifecycle and return it - cha-lib : return error code based on http error code - display better message when auth is required - skip graceful mode when repo is mounted Change-Id: I4e89605fd3c42ad6ba02115c32297d16f49b3ffe Signed-off-by: Florent BENOIT <[email protected]>
eclipse-che · Feb 13, 2017 · 889884f · 889884f
1 parent eb47050
commit 889884f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dockerfiles/base/scripts/base/commands/cmd_stop.sh b/dockerfiles/base/scripts/base/commands/cmd_stop.sh
@@ -33,7 +33,7 @@ cmd_stop() {
   FORCE_STOP=false
   if [[ "$@" == *"--skip:graceful"* ]]; then
   	FORCE_STOP=true
-  elif local_repo; then
+  elif local_repo || local_assembly; then
     warning "Development mode [skip graceful stop]"
     FORCE_STOP=true
   fi
@@ -48,7 +48,7 @@ cmd_stop() {
         error "Authentication failed on the system. Please provide --user and -password values or user --skip:graceful to bypass graceful stop."
         return 2;
       elif [[ ${GRACEFUL_STATUS_RESULT} -ne 0 ]]; then
-        error "We encountered an error -- see $CHE_HOST_CONFIG/cli.log. Graceful stop can be skipped with --skip:graceful"
+        error "We encountered an error during graceful stop - see $CHE_HOST_CONFIG/cli.log. (hint: --skip:graceful does not wait for workspace stop)"
         return 2;
       fi
     fi