From b491101817d1c892ba0befec35f417cdb27a7ea1 Mon Sep 17 00:00:00 2001
From: "Brian J. Murrell" <brian.murrell@intel.com>
Date: Wed, 11 Mar 2020 09:37:22 -0400
Subject: [PATCH] Allow vendor change, try #3

Quick-build: true
Skip-checkpatch: true
Skip-run_test: true
Signed-off-by: Brian J. Murrell <brian.murrell@intel.com>
---
 utils/docker/Dockerfile.leap.15 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15
index 3fabaeaed2f..aaa2098109b 100644
--- a/utils/docker/Dockerfile.leap.15
+++ b/utils/docker/Dockerfile.leap.15
@@ -119,6 +119,8 @@ RUN if $QUICKBUILD; then
         zypper --non-interactive --gpg-auto-import-keys refresh leap15;                                          \
         echo "Installing: $QUICKBUILD_DEPS";                                                                     \
         set -x;                                                                                                  \
+        cat /etc/zypp/zypp.conf;                                                                                 \
+        echo "solver.allowVendorChange = true" >> /etc/zypp/zypp.conf;                                           \
         echo "$QUICKBUILD_DEPS" | tr '\n' '\0' | xargs -0 zypper --non-interactive install --force;              \
     fi