diff options
Diffstat (limited to 'src/fedpkg.py')
| -rwxr-xr-x | src/fedpkg.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py index b1819f6..01e4e44 100755 --- a/src/fedpkg.py +++ b/src/fedpkg.py @@ -12,6 +12,7 @@ import argparse import pyfedpkg +import pyfedpkg.initial_merge as initial_merge import fedora_cert import os import sys @@ -636,9 +637,6 @@ def verrel(args): sys.exit(1) print('%s-%s-%s' % (mymodule.module, mymodule.ver, mymodule.rel)) -def initial_merge(args): - import pyfedpkg.initial_merge - pyfedpkg.initial_merge.handle_path(args.path) # THe main code goes here if __name__ == '__main__': @@ -939,9 +937,7 @@ packages will be built sequentially. parser_verrel.set_defaults(command = verrel) # Initial branch merges - parser_initial_merge = subparsers.add_parser('initial-merge', - help = 'FIXME') - parser_initial_merge.set_defaults(command = initial_merge) + parser_initial_merge = initial_merge.get_parser(subparsers) # Parse the args args = parser.parse_args() |