commit 97f7ad43c472737539ce1a603a10f9762974e8df
author Girish Pathak <girish.pathak@arm.com> Thu Aug 27 11:38:15 2020 +0100
committer Zelalem <zelalem.aweke@arm.com> Fri Aug 28 17:47:36 2020 -0500
tree 870fc0a7ab8d446538473d60821fa4b8de8a6eb8
parent 91135edf733eecbf40836fbb61d6d9f640edec5c

Fix incorrectly assigned scp_src_repo_url variable

This change fixes scp_src_repo_url variable which was
assigned incorrectly in arm-env.sh. scp_src_repo_url should
get initialized to SCP_SRC_REPO_URL if it is not defined
however latest change which adds arm-env.sh
has broken this assumption.
See "ae11ebfe35c7eba93f935585caa03f56a2782d3b
Add support for environmental settings".

Change-Id: Ie1e9515873f69569d66ef1a7c4283bfadd081118
Signed-off-by: Girish Pathak <girish.pathak@arm.com>

utils.sh

diff --git a/utils.sh b/utils.sh
index d0ffd1b..2a92239 100644
--- a/utils.sh
+++ b/utils.sh
@@ -307,6 +307,7 @@
 tftf_src_repo_url="${tftf_src_repo_url:-$TFTF_SRC_REPO_URL}"
 tftf_src_repo_url="${tftf_src_repo_url:-https://$tforg_gerrit_url/TF-A/tf-a-tests}"
 scp_src_repo_url="${scp_src_repo_url:-$SCP_SRC_REPO_URL}"
+scp_src_repo_url="${scp_src_repo_url:-$scp_src_repo_default}"
 
 # FIXME set a sane default for tfa_downloads
 tfa_downloads="${tfa_downloads:-file:///downloads/tf-a}"