Skip to content

Commit

Permalink
schema_salad/main.py: --version now correctly prints version
Browse files Browse the repository at this point in the history
  • Loading branch information
manu-chroma committed Mar 21, 2017
1 parent 61c2203 commit 04c6784
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions schema_salad/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ def main(argsl=None): # type: (List[str]) -> int
"--print-index", action="store_true", help="Print node index")
exgroup.add_argument("--print-metadata",
action="store_true", help="Print document metadata")
exgroup.add_argument("--version", action="store_true",
help="Print version")

exgroup = parser.add_mutually_exclusive_group()
exgroup.add_argument("--strict", action="store_true", help="Strict validation (unrecognized or out of place fields are error)",
Expand All @@ -79,11 +77,18 @@ def main(argsl=None): # type: (List[str]) -> int
exgroup.add_argument("--debug", action="store_true",
help="Print even more logging")

parser.add_argument("schema", type=str)
parser.add_argument("schema", type=str, nargs="?", default=None)
parser.add_argument("document", type=str, nargs="?", default=None)
parser.add_argument("--version", "-v", action="store_true",
help="Print version", default=None)


args = parser.parse_args(argsl)

if args.version is None and args.schema is None:
print('%s: error: too few arguments' % sys.argv[0])
exit(0)

if args.quiet:
_logger.setLevel(logging.WARN)
if args.debug:
Expand All @@ -92,10 +97,10 @@ def main(argsl=None): # type: (List[str]) -> int
pkg = pkg_resources.require("schema_salad")
if pkg:
if args.version:
print("%s %s" % (sys.argv[0], pkg[0].version))
print("%s Current version: %s" % (sys.argv[0], pkg[0].version))
return 0
else:
_logger.info("%s %s", sys.argv[0], pkg[0].version)
_logger.info("%s Current version: %s", sys.argv[0], pkg[0].version)

# Get the metaschema to validate the schema
metaschema_names, metaschema_doc, metaschema_loader = schema.get_metaschema()
Expand Down

0 comments on commit 04c6784

Please sign in to comment.