openstack/diskimage-builder
Code Issues Proposed changes

Merge "Support repo names with multiple '-'s"

Browse Source
This commit is contained in:
Jenkins 2013-07-19 19:45:42 +00:00 committed by Gerrit Code Review
commit 5f52562570
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elements/source-repositories/extra-data.d/98-source-repositories
View File

@ -27,11 +27,11 @@ function get_repos_for_element(){
local REPO_SUB_DIRECTORY=$(dirname $REPO_DIRECTORY) local REPO_SUB_DIRECTORY=$(dirname $REPO_DIRECTORY)
# REPOTYPE can be overridden with DIB_REPOTYPE_{name} # REPOTYPE can be overridden with DIB_REPOTYPE_{name}
local REPOTYPE_OVERRIDE=DIB_REPOTYPE_${REPONAME/-/_} local REPOTYPE_OVERRIDE=DIB_REPOTYPE_${REPONAME//-/_}
REPOTYPE=${!REPOTYPE_OVERRIDE:-$REPOTYPE} REPOTYPE=${!REPOTYPE_OVERRIDE:-$REPOTYPE}
# REPOLOCATION can be overridden with DIB_REPOLOCATION_{name} # REPOLOCATION can be overridden with DIB_REPOLOCATION_{name}
local REPOLOCATION_OVERRIDE=DIB_REPOLOCATION_${REPONAME/-/_} local REPOLOCATION_OVERRIDE=DIB_REPOLOCATION_${REPONAME//-/_}
REPOLOCATION=${!REPOLOCATION_OVERRIDE:-$REPOLOCATION} REPOLOCATION=${!REPOLOCATION_OVERRIDE:-$REPOLOCATION}
if [ "$REPOLOCATION" = "$REPO_ORIG_LOCATION" ] ; then if [ "$REPOLOCATION" = "$REPO_ORIG_LOCATION" ] ; then
# We're pulling from the element specified repo, do caching for # We're pulling from the element specified repo, do caching for
@ -43,7 +43,7 @@ function get_repos_for_element(){
fi fi
# REPOREF can be overridden with DIB_REPOREF_{name} # REPOREF can be overridden with DIB_REPOREF_{name}
local REPOREF_OVERRIDE=DIB_REPOREF_${REPONAME/-/_} local REPOREF_OVERRIDE=DIB_REPOREF_${REPONAME//-/_}
REPOREF=${!REPOREF_OVERRIDE:-$REPOREF} REPOREF=${!REPOREF_OVERRIDE:-$REPOREF}
case $REPOTYPE in case $REPOTYPE in