commit/galaxy-central: natefoo: Minor bug fixes for main.py (webless Galaxy entry point).
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/85b1de6a6ebd/ Changeset: 85b1de6a6ebd User: natefoo Date: 2015-02-05 04:40:59+00:00 Summary: Minor bug fixes for main.py (webless Galaxy entry point). Affected #: 1 file diff -r 00f4c600b89fdd52b0296e8bfc599a16485838b2 -r 85b1de6a6ebdfe30e14b96f8dc7d13105ae04c2b lib/galaxy/main.py --- a/lib/galaxy/main.py +++ b/lib/galaxy/main.py @@ -36,7 +36,7 @@ # Vaguely Python 2.6 compatibile ArgumentParser import try: - from argparser import ArgumentParser + from argparse import ArgumentParser except ImportError: from optparse import OptionParser @@ -202,9 +202,6 @@ def main(): - if Daemonize is None: - raise ImportError(REQUIRES_DAEMONIZE_MESSAGE) - arg_parser = ArgumentParser(description=DESCRIPTION) GalaxyConfigBuilder.populate_options(arg_parser) args = arg_parser.parse_args() @@ -217,6 +214,9 @@ log.setLevel(logging.DEBUG) log.propagate = False if args.daemonize: + if Daemonize is None: + raise ImportError(REQUIRES_DAEMONIZE_MESSAGE) + keep_fds = [] if args.daemon_log_file: fh = logging.FileHandler(args.daemon_log_file, "w") Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org