Add --use-higher-deps option, it means which repo provides higher version deps, use it

Change-Id: I7e0d2b80b8a956eb36ab548494c8a8fe7f0d8ef1

diff --git a/data/gbs.sh b/data/gbs.sh
index 2278f9e..0fe30fb 100644 (file)
--- a/data/gbs.sh
+++ b/data/gbs.sh
@@ -83,7 +83,7 @@ __gbs ()
     lb_opts="
         --arch= --repository= --dist= --buildroot= --clean
         --include-all --extra-packs= --spec= --commit= --cache
-        --skip-conf-repos --profile= --noinit --keep-packs
+        --skip-conf-repos --profile= --noinit --keep-packs --use-higher-deps
         --clean-repos --define --baselibs
     "
     cr_opts="

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 143756b..3ef6596 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -218,6 +218,8 @@ def prepare_depanneur_opts(args):
         cmd_opts += ['--no-configure']
     if args.keep_packs:
         cmd_opts += ['--keep-packs']
+    if args.use_higher_deps:
+        cmd_opts += ['--use-higher-deps']
     if args.baselibs:
         cmd_opts += ['--baselibs']
     if args.skip_srcrpm:

diff --git a/tools/gbs b/tools/gbs
index 5cc1dab..6f2210d 100755 (executable)
--- a/tools/gbs
+++ b/tools/gbs
@@ -213,6 +213,8 @@ def build_parser(parser):
                         help='keep unused packages in build root. without '
                         'this option, unused packages will be removed from '
                         'build root')
+    group.add_argument('--use-higher-deps', action='store_true',
+                        help='Which repo provides higher version deps, use it')
 
     group = parser.add_argument_group('speed up building options')
     group.add_argument('--incremental', action='store_true',