Pulled small bug fixes from V1_6_X to be released in 1.6.17.1.

Merged revisions r219559 and r219560.

1 files changed, 5 insertions, 1 deletions

diff --git a/repsys b/repsys
index c5f4b09..8180bfe 100755
--- a/repsys
+++ b/repsys
@@ -69,10 +69,14 @@ def dispatch_command(command, argv, debug=0):
             traceback.print_exc()
             sys.exit(1)
         raise Error, "invalid command '%s'" % command
-    plugins.load()
     command_module.main()
     
 if __name__ == "__main__":
+    try:
+        plugins.load()
+    except Error, e:
+        sys.stderr.write("plugin initialization error: %s\n" % e)
+        sys.exit(1)
     do_command(parse_options, dispatch_command)
 
 # vim:et:ts=4:sw=4