From 0aaa9aa57b9c28fd78816a990c74b98bc8322674 Mon Sep 17 00:00:00 2001 From: Huang Hao Date: Wed, 20 Feb 2013 16:30:27 +0800 Subject: [PATCH] Update --binary-list and add --binary-from-file two options. #720 Rename old --binary-list option to --binary-from-file and add a new --binary-list to accept a comma-separated string to specify binary list of packages to build. Change-Id: Icaea10e902915dc08410efb027575a446c024fb9 --- gitbuildsys/cmd_build.py | 9 ++++++--- tools/gbs | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py index 6c62aed..df29cd6 100644 --- a/gitbuildsys/cmd_build.py +++ b/gitbuildsys/cmd_build.py @@ -172,10 +172,13 @@ def prepare_depanneur_opts(args): if args.keep_packs: cmd_opts += ['--keep-packs'] if args.binary_list: - if not os.path.exists(args.binary_list): + blist = [ i.strip() for i in args.binary_list.split(',') ] + cmd_opts += ['--binary-list=%s' % ','.join(blist)] + if args.binary_from_file: + if not os.path.exists(args.binary_from_file): raise GbsError('specified binary list file %s not exists' % \ - args.binary_list) - cmd_opts += ['--binary=%s' % args.binary_list] + args.binary_from_file) + cmd_opts += ['--binary-from-file=%s' % args.binary_from_file] if args.deps: cmd_opts += ['--deps'] if args.rdeps: diff --git a/tools/gbs b/tools/gbs index d3eb9f3..2c3b3e2 100755 --- a/tools/gbs +++ b/tools/gbs @@ -230,6 +230,10 @@ def build_parser(parser): group = parser.add_argument_group('package selection options') group.add_argument('--binary-list', + help='specify a package list to be built. Multiple ' + 'packages can be separated by comma(,). Note: package ' + 'names are from spec files, not the package dir name') + group.add_argument('--binary-from-file', help='specify a binary package list file. Packages ' 'listed in this file will be selected to be built. ' 'The format of binary-list file is one package for one ' -- 2.7.4