From 177fe929cddbef4318e1fe559fae7eba20b1bab0 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Mon, 21 Oct 2019 13:26:42 -0400
Subject: [PATCH] Update mockchain-parallel wrapper for mock-1.4.20

The recently released mock-1.4.20 replaces mockchain with a bash
wrapper that calls mock --chain. However, the StarlingX
mockchain-parallel utility assumes mockchain is python, and fails to
determine the mockchain version as a result. This causes build
failures when mock-1.4.20 is installed.

This update enhances mockchain-parallel to use the version from the
installed mock rpm if the version cannot be determined from mockchain
itself. This allows mockchain-parallel to work with mock-1.4.20, as
well as previously supported versions of mock.

Change-Id: Ic0360fc64e277f1816036b6259e6e51d94c7f368
Closes-Bug: 1849147
Signed-off-by: Don Penney <don.penney@windriver.com>
(cherry picked from commit 639e435594d213709df09fcf1fb10f2d03c55094)
---
 build-tools/mockchain-parallel | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/build-tools/mockchain-parallel b/build-tools/mockchain-parallel
index 7e37e5b1..8645d30f 100755
--- a/build-tools/mockchain-parallel
+++ b/build-tools/mockchain-parallel
@@ -59,8 +59,11 @@ DEFAULT_MOCKCHAIN_PARALLEL_PATH="${MOCKCHAIN_PARALLEL_PATH_ROOT}-1.3.4"
 MOCKCHAIN_INTERPRETER_PATH=$(interpreter_path ${MOCKCHAIN_PATH})
 MOCKCHAIN_VER=$(get__version__ ${MOCKCHAIN_PATH})
 if [ -z "${MOCKCHAIN_VER}" ]; then
-    echo "Error: Failed to determine version of '${MOCKCHAIN_PATH}'"
-    exit 1
+    MOCKCHAIN_VER=$(rpm -q --queryformat '%{VERSION}' mock)
+    if [ -z "${MOCKCHAIN_VER}" ]; then
+        echo "Error: Failed to determine version of '${MOCKCHAIN_PATH}'"
+        exit 1
+    fi
 fi
 
 BEST_VER=""
@@ -101,5 +104,5 @@ if [ -z "${MOCKCHAIN_PARALLEL_PATH}" ]; then
     MOCKCHAIN_PARALLEL_PATH="${DEFAULT_MOCKCHAIN_PARALLEL_PATH}"
 fi
 
-echo "PYTHONDONTWRITEBYTECODE=true exec ${MOCKCHAIN_INTERPRETER_PATH} ${MOCKCHAIN_PARALLEL_PATH} $@"
-PYTHONDONTWRITEBYTECODE=true exec ${MOCKCHAIN_INTERPRETER_PATH} ${MOCKCHAIN_PARALLEL_PATH} "$@"
+echo "PYTHONDONTWRITEBYTECODE=true exec ${MOCKCHAIN_PARALLEL_INTERPRETER_PATH} ${MOCKCHAIN_PARALLEL_PATH} $@"
+PYTHONDONTWRITEBYTECODE=true exec ${MOCKCHAIN_PARALLEL_INTERPRETER_PATH} ${MOCKCHAIN_PARALLEL_PATH} "$@"