From d3f06218f86870c7af178b39395ff3bc0e51e09e Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 5 Mar 2015 15:04:20 +0100
Subject: [PATCH] Minor update to parsing

---
 evennia/server/evennia_launcher.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index f87ec4f383..990b69f38a 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -93,11 +93,11 @@ CREATED_NEW_GAMEDIR = \
     """
 
 ERROR_INPUT = \
-    """
-    The argument(s)
-        {args} {kwargs}
-    is/are not recognized by Evennia nor Django. Use -h for help.
-    """
+"""
+    Command
+      {args} {kwargs}
+    raised an error: '{traceback}'.
+"""
 
 ERROR_NO_GAMEDIR = \
     """
@@ -903,6 +903,8 @@ def main():
                       help="Start given server component under the Python profiler.")
     parser.add_argument('--dummyrunner', nargs=1, action='store', dest='dummyrunner', metavar="N",
                         help="Tests a running server by connecting N dummy players to it.")
+    parser.add_argument('--settings', nargs=1, action='store', dest='customsettings', metavar="/rel/path/to/file",
+                      help="Start evennia with an alternative settings file.")
     parser.add_argument("option", nargs='?', default="noop",
                         help="Operational mode: 'start', 'stop', 'restart' or 'menu'.")
     parser.add_argument("service", metavar="component", nargs='?', default="all",
@@ -961,15 +963,19 @@ def main():
         if unknown_args:
             for arg in unknown_args:
                 if arg.startswith("--"):
-                    kwargs[arg.lstrip("--")] = True
+                    if "=" in arg:
+                        arg, value  = [p.strip() for p in arg.split("=", 1)]
+                    else:
+                        value = True
+                    kwargs[arg.lstrip("--")] = value
                 else:
                     args.append(arg)
         try:
             django.core.management.call_command(*args, **kwargs)
-        except django.core.management.base.CommandError:
+        except django.core.management.base.CommandError, exc:
             args = ", ".join(args)
             kwargs = ", ".join(["--%s" % kw for kw in kwargs])
-            print ERROR_INPUT.format(args=args, kwargs=kwargs)
+            print ERROR_INPUT.format(traceback=exc, args=args, kwargs=kwargs)
     else:
         # no input; print evennia info
         print ABOUT_INFO