summaryrefslogtreecommitdiffstats
path: root/src/fedpkg.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/fedpkg.py')
-rwxr-xr-xsrc/fedpkg.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py
index 005b152..b1819f6 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -636,6 +636,10 @@ 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__':
# Create the parser object
@@ -934,6 +938,11 @@ packages will be built sequentially.
' name-version-release')
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)
+
# Parse the args
args = parser.parse_args()