From 7c513fc22b8fe8e4f2468febdbb3214b749a8e77 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Sun, 21 Dec 2014 13:51:59 +0000
Subject: [PATCH] don't duplicate output on error in with_container_netns This
 does not cause any problems right now, since all the call sites swallow
 stdout on error. But it is wrong nevertheless.

---
 weave | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index 1d3be358..43892be7 100755
--- a/weave
+++ b/weave
@@ -191,9 +191,9 @@ with_container_netns () {
             echo "Failure during network configuration for container $CONTAINER:" >&2
             cat $IP_TMPFILE >&2
         fi
+    else
+        cat $IP_TMPFILE
     fi
-
-    cat $IP_TMPFILE  # no error - send the output to stdout
     rm -f $IP_TMPFILE /var/run/netns/$NETNS
     return $STATUS
 }