openstack/deb-python-diskimage-builder
Code Issues Proposed changes

98-source-repositories tries to return from script

Browse Source 
In 8b2325118f we added a line
so that 98-source-repositories tries to return from the top
level script (not from within a function).

Also, remove the return 1 within the function as well
because we just want to continue in these cases.

Change-Id: I66eddc12208b278594a0a8d8676c38d72045ca75
This commit is contained in:
Dan Prince
2014-03-04 13:29:06 -08:00
parent 1080b40368
commit ef379f05e4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ function get_repos_for_element(){
if [ ! -e "$CACHE_PATH" ] ; then if [ ! -e "$CACHE_PATH" ] ; then
mv -n $OLD_CACHE_PATH $CACHE_PATH mv -n $OLD_CACHE_PATH $CACHE_PATH
else else
echo "Not replacing new cache location with old cache" && return 1 echo "Not replacing new cache location with old cache"
fi fi
fi fi
@@ -164,7 +164,7 @@ if [ -e "$OLD_CACHE_BASE" ] ; then
if [ ! -e "$CACHE_BASE" ] ; then if [ ! -e "$CACHE_BASE" ] ; then
mv -n $OLD_CACHE_BASE $CACHE_BASE mv -n $OLD_CACHE_BASE $CACHE_BASE
else else
echo "Not replacing new cache location with old cache" && return 1 echo "Not replacing new cache location with old cache"
fi fi
fi fi
mkdir -p $CACHE_BASE mkdir -p $CACHE_BASE