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 2278f9e6f514f7204811835f8a155cf45d6aa55d..0fe30fbc73c560de426eeedc412fe9faa9693a64 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 5fdaa7507fa1ad7bef1aed497e983430b452b390..594c76c5ab1d498bb890a6720625e5b487905598 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 2a32553a19e2e0eb6fb924831b2672215dd100d7..d7b56225ab04432909bc29e70a5206d2ebb0c749 100755 (executable)
--- a/tools/gbs
+++ b/tools/gbs
@@ -210,6 +210,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',