From 5bcf6d3c252dfebee0512967981282710aff88f3 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 20 Mar 2014 10:16:59 +0200 Subject: [PATCH] build: support for the new development/* branches The build now detects the package maintenance model (separate packaging and devel branches or the old single packaging branch). Change-Id: I2e2d22a7582e1c9e70182eea6ce2c3f1f6b97ad5 Signed-off-by: Markus Lehtonen --- gitbuildsys/cmd_build.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py index 60ba061..0d77626 100644 --- a/gitbuildsys/cmd_build.py +++ b/gitbuildsys/cmd_build.py @@ -358,6 +358,11 @@ def main(args): if args.spec: cmd += ['--spec=%s' % args.spec] + # Determine if we're on devel branch + orphan_packaging = configmgr.get('packaging_branch', 'orphan-devel') + if orphan_packaging: + cmd += ['--spec-commit=%s' % orphan_packaging] + log.debug("running command: %s" % ' '.join(cmd)) retcode = os.system(' '.join(cmd)) if retcode != 0: -- 2.34.1