Merge pull request #614 from awh/fix_weave_version

`weave version` continues after missing image

Fixes #597.
This commit is contained in:
rade committed 2015-04-28 18:23:09 +01:00
commit 153731c1f3
1 file changed
+2 -2
+2 -2
View File
@@ -739,8 +739,8 @@ case "$COMMAND" in
version)
[ $# -eq 0 ] || usage
echo weave script $SCRIPT_VERSION
ask_version $CONTAINER_NAME $IMAGE
ask_version $DNS_CONTAINER_NAME $DNS_IMAGE
ask_version $CONTAINER_NAME $IMAGE || true
ask_version $DNS_CONTAINER_NAME $DNS_IMAGE || true
if ! EXEC_IMAGE_ID=$(docker inspect --format='{{.Id}}' $EXEC_IMAGE 2>/dev/null) ; then
echo "Unable to find $EXEC_IMAGE image." >&2
else