sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve usability of the source-repositories cache

Browse Source 
* Rename the cache directory for sources

Make the cache directory name match that of the element that creates
it.  This makes it easier to find and more logically implies what
element created the cache directory.

* Add REPONAME to repository cache directory

For better usability add the reponame to the directory created
to cache it.

* Add migration code

Move pre-existing cache directories of the old name to the new name.

Change-Id: Ic62f19acb1746888ccbdf95eebf6e653f3e66357
This commit is contained in:
Jon-Paul Sullivan 2014-02-24 10:43:59 +00:00
parent a84611d766
commit 8b2325118f
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,18 @@ function get_repos_for_element(){
# Determine a unique cache path for this repo # Determine a unique cache path for this repo
CACHE_NAME=$(echo "${REPOTYPE}_${REPOLOCATION}" | sha1sum | awk '{ print $1 }' ) CACHE_NAME=$(echo "${REPOTYPE}_${REPOLOCATION}" | sha1sum | awk '{ print $1 }' )
CACHE_PATH=~/.cache/image-create/repository-sources/$CACHE_NAME OLD_CACHE_PATH=${CACHE_BASE}/${CACHE_NAME}
# Add the repo name to the sha1sum for readability
CACHE_NAME=${REPONAME//-/_}_${CACHE_NAME}
CACHE_PATH=${CACHE_BASE}/$CACHE_NAME
# If the old cache name exists, move it to the new cache name
if [ -e "$OLD_CACHE_PATH" ] ; then
if [ ! -e "$CACHE_PATH" ] ; then
mv -n $OLD_CACHE_PATH $CACHE_PATH
else
echo "Not replacing new cache location with old cache" && return 1
fi
fi
case $REPOTYPE in case $REPOTYPE in
git) git)
@ -134,7 +145,17 @@ function get_repos_for_element(){
done < $REPO_SOURCES done < $REPO_SOURCES
} }
mkdir -p ~/.cache/image-create/repository-sources/ CACHE_BASE=~/.cache/image-create/source-repositories
OLD_CACHE_BASE=~/.cache/image-create/repository-sources
# If the old cache name exists, move it to the new cache name
if [ -e "$OLD_CACHE_BASE" ] ; then
if [ ! -e "$CACHE_BASE" ] ; then
mv -n $OLD_CACHE_BASE $CACHE_BASE
else
echo "Not replacing new cache location with old cache" && return 1
fi
fi
mkdir -p $CACHE_BASE
# Get source repositories for the target # Get source repositories for the target
for _SOURCEREPO in $(find $TMP_HOOKS_PATH -maxdepth 1 -name "source-repository-*" -not -name '*~'); do for _SOURCEREPO in $(find $TMP_HOOKS_PATH -maxdepth 1 -name "source-repository-*" -not -name '*~'); do