BUG: commandline args messed up the configuration.

src/caosdb/utils/caosdb_admin.py

@@ -230,7 +230,7 @@ def main(argv=None):
     program_build_date = str(__updated__)
     program_version_message = '%%(prog)s %s (%s)' % (
         program_version, program_build_date)
-    program_shortdesc = __import__('__main__').__doc__.split("\n")[1]
+    program_shortdesc = __import__('__main__').__doc__
     program_license = '''%s
 
   Created by timm fitschen on %s.
@@ -245,31 +245,8 @@ USAGE
     # Setup argument parser
     parser = ArgumentParser(description=program_license,
                             formatter_class=RawDescriptionHelpFormatter)
-    parser.add_argument(
-        "-v",
-        "--verbose",
-        dest="verbose",
-        action="count",
-        help="Set verbosity level [default: %(default)s]",
-        default=0)
     parser.add_argument('-V', '--version', action='version',
                         version=program_version_message)
-    parser.add_argument(
-        '-t',
-        '--timeout',
-        dest="con_timeout",
-        help="Timeout in seconds for the database requests. [default: %(default)s]",
-        metavar="TIMEOUT",
-        default=200)
-    parser.add_argument(
-        '-u',
-        '--user',
-        dest="con_user",
-        help="The user name you want to login with and do the administration stuff with. It will be prompted for a password.",
-        metavar="USER")
-    parser.add_argument('-c', '--connection_uri', dest="con_uri",
-                        help="The URI of the caosdb server.", metavar="URI")
-
     subparsers = parser.add_subparsers(
         title="commands",
         metavar="COMMAND",
@@ -558,17 +535,8 @@ USAGE
     # Process arguments
     args = parser.parse_args()
 
-    VERBOSITY = args.verbose
-    timeout = int(args.con_timeout)
-
-    password = None
-    if args.con_user is not None:
-        password = getpass.getpass(prompt="login password: ")
 
-    db.configure_connection(url=args.con_uri, username=args.con_user,
-                            password=password, timeout=timeout)
-    db.get_connection()._debug = lambda: VERBOSITY
-    db.Container._debug = staticmethod(lambda: VERBOSITY)
+    db.configure_connection()._login()
 
     return args.call(args)