Merge pull request #1002 from dwalton76/vtysh-exit-non-zero

vtysh: vtysh -f FOO should exit non-zero if it hits an error

tools/frr-reload.py

@@ -1162,19 +1162,11 @@ if __name__ == '__main__':
                         for line in lines_to_configure:
                             fh.write(line + '\n')
 
-                    output = subprocess.check_output(['/usr/bin/vtysh', '-f', filename])
-
-                    # exit non-zero if we see these errors
-                    for x in ('BGP instance name and AS number mismatch',
-                              'BGP instance is already running',
-                              '% not a local address'):
-                        for line in output.splitlines():
-                            if x in line:
-                                msg = "ERROR: %s" % x
-                                log.error(msg)
-                                print msg
+                    try:
+                        subprocess.check_output(['/usr/bin/vtysh', '-f', filename])
+                    except subprocess.CalledProcessError as e:
+                        log.warning("frr-reload.py failed due to\n%s" % e.output)
                         reload_ok = False
-
                     os.unlink(filename)
 
         # Make these changes persistent

vtysh/vtysh.c

@@ -752,6 +752,7 @@ int vtysh_config_from_file(struct vty *vty, FILE *fp)
 							lineno, cmd_stat,
 							vtysh_client[i].name,
 							vty->buf);
+						retcode = cmd_stat;
 						break;
 					}
 				}