Clean up --all-nodes error output slightly

2 files changed, 2 insertions, 3 deletions

diff --git a/cxmanage/controller.py b/cxmanage/controller.py
index 37590b3..d80db61 100644
--- a/cxmanage/controller.py
+++ b/cxmanage/controller.py
@@ -216,7 +216,7 @@ class Controller:
                     self.add_target(ipinfo[1], username, password)
 
         # Print results and errors
-        if self.verbosity >= 1:
+        if self.verbosity >= 1 and len(self.targets) > 0:
             print "Discovered the following IP addresses:"
             for target in self.targets:
                 print target.address
diff --git a/scripts/cxmanage b/scripts/cxmanage
index 7a1f51c..606a85f 100755
--- a/scripts/cxmanage
+++ b/scripts/cxmanage
@@ -353,8 +353,7 @@ def add_targets(controller, args):
     # Add hosts to controller
     if args.all_nodes:
         if controller.add_fabrics(hosts, args.user, args.password):
-            print "ERROR: Failed to get IP info from all hosts. Aborting."
-            print
+            print "ERROR: Failed to get IP addresses. Aborting.\n"
             sys.exit(1)
     else:
         for host in hosts: