From a16a8067763bd3965e3fd40ace6f157922c36e4b Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Fri, 13 May 2016 15:08:11 +0800
Subject: [PATCH] new: catch error earlier. !minor

---
 bin/compose | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bin/compose b/bin/compose
index 946e442..63beecc 100755
--- a/bin/compose
+++ b/bin/compose
@@ -747,7 +747,10 @@ _get_docker_compose_service_mixin() {
         return 0
     fi
 
-    master_charm=$(get_top_master_charm_for_service "$service") || return 1
+    master_charm=$(get_top_master_charm_for_service "$service") || {
+        err "Failed to get top master charm for service $DARKYELLOW$service$NORMAL"
+        return 1
+    }
 
     ## The compose part
 
@@ -794,7 +797,10 @@ get_docker_compose () {
     debug "Compiling 'docker-compose.yml' base for $DARKYELLOW$@$NORMAL..."
     for target_service in "$@"; do
         start=$SECONDS
-        services=$(get_ordered_service_dependencies "$target_service") || return 1
+        services=$(get_ordered_service_dependencies "$target_service") || {
+            err "Failed to get dependencies for $DARKYELLOW$target_service$NORMAL"
+            return 1
+        }
         debug "  $DARKYELLOW$target_service$NORMAL deps:$DARKYELLOW" $services "$NORMAL$GRAY(in $((SECONDS - start))s)$NORMAL"
         for service in $services; do
 
@@ -808,7 +814,10 @@ get_docker_compose () {
             ## mark the service as "loaded" as well as it's containers
             ## if this is a subordinate service
             start_service=$SECONDS
-            entries[$service]=$(_get_docker_compose_service_mixin "$service") || return 1
+            entries[$service]=$(_get_docker_compose_service_mixin "$service") || {
+                err "Failed to get service mixin for $DARKYELLOW$service$NORMAL"
+                return 1
+            }
             debug "    Applied $DARKYELLOW$service$NORMAL charm metadata mixins $GRAY(in $((SECONDS - start_service))s)$NORMAL"
         done
         debug "    ..finished all mixins for $DARKYELLOW$target_service$NORMAL $GRAY(in $((SECONDS - start))s)$NORMAL"