From a4a0523f2b5cac587792f8d53dc7367e75952c08 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Fri, 19 Jul 2013 17:41:32 +0100 Subject: [PATCH] Support repo names with multiple '-'s The search and replace that converted dashes in REPONAME only converted the first dash. They should all be converted. Change-Id: I76a48cf5bdfa8664f0a65d0238fa4da7d80305db --- .../source-repositories/extra-data.d/98-source-repositories | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/elements/source-repositories/extra-data.d/98-source-repositories b/elements/source-repositories/extra-data.d/98-source-repositories index 1a531871d..1397264a1 100755 --- a/elements/source-repositories/extra-data.d/98-source-repositories +++ b/elements/source-repositories/extra-data.d/98-source-repositories @@ -27,11 +27,11 @@ function get_repos_for_element(){ local REPO_SUB_DIRECTORY=$(dirname $REPO_DIRECTORY) # REPOTYPE can be overridden with DIB_REPOTYPE_{name} - local REPOTYPE_OVERRIDE=DIB_REPOTYPE_${REPONAME/-/_} + local REPOTYPE_OVERRIDE=DIB_REPOTYPE_${REPONAME//-/_} REPOTYPE=${!REPOTYPE_OVERRIDE:-$REPOTYPE} # REPOLOCATION can be overridden with DIB_REPOLOCATION_{name} - local REPOLOCATION_OVERRIDE=DIB_REPOLOCATION_${REPONAME/-/_} + local REPOLOCATION_OVERRIDE=DIB_REPOLOCATION_${REPONAME//-/_} REPOLOCATION=${!REPOLOCATION_OVERRIDE:-$REPOLOCATION} if [ "$REPOLOCATION" = "$REPO_ORIG_LOCATION" ] ; then # We're pulling from the element specified repo, do caching for @@ -43,7 +43,7 @@ function get_repos_for_element(){ fi # REPOREF can be overridden with DIB_REPOREF_{name} - local REPOREF_OVERRIDE=DIB_REPOREF_${REPONAME/-/_} + local REPOREF_OVERRIDE=DIB_REPOREF_${REPONAME//-/_} REPOREF=${!REPOREF_OVERRIDE:-$REPOREF} case $REPOTYPE in