From: Li Jinjing Date: Tue, 9 Dec 2014 09:49:21 +0000 (+0800) Subject: Get value of "fallback_to_native" from gbs configuration X-Git-Tag: submit/devel/20150702.123000~6^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fc0a5b13232f53161903af034a3f7607868a0d7;p=tools%2Fgbs.git Get value of "fallback_to_native" from gbs configuration With command "gbs -c lb -A arch", if name of configration isn't .gbs.conf, gbs will fail to get the value of "fallback_to_native" from the configuration. Fixes: #2263 Change-Id: I158f0aaef830942d278fcdf6f3d639afb0378a7f Signed-off-by: Li Jinjing --- diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py index 761b124..c86ccd2 100644 --- a/gitbuildsys/cmd_build.py +++ b/gitbuildsys/cmd_build.py @@ -33,7 +33,7 @@ from gitbuildsys.utils import Temp, RepoParser, read_localconf,\ from gitbuildsys.errors import GbsError, Usage from gitbuildsys.conf import configmgr from gitbuildsys.safe_url import SafeURL -from gitbuildsys.cmd_export import get_packaging_dir +from gitbuildsys.cmd_export import get_packaging_dir, config_is_true from gitbuildsys.log import LOGGER as log from gbp.rpm.git import GitRepositoryError, RpmGitRepository @@ -409,8 +409,14 @@ def main(args): cmd += ['--upstream-branch=%s' % args.upstream_branch] if args.upstream_tag: cmd += ['--upstream-tag=%s' % args.upstream_tag] - if args.fallback_to_native: + + if args.conf and args.conf != '.gbs.conf': + fallback = configmgr.get('fallback_to_native') + else: + fallback = '' + if args.fallback_to_native or config_is_true(fallback): cmd += ['--fallback-to-native'] + if args.squash_patches_until: cmd += ['--squash-patches-until=%s' % args.squash_patches_until] if args.no_patch_export: