From ef379f05e41d51606873fa8d9ed6670aa103aefe Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 4 Mar 2014 13:29:06 -0800 Subject: [PATCH] 98-source-repositories tries to return from script In 8b2325118ff8d3334d51d86d293962acc8dd0962 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 --- .../source-repositories/extra-data.d/98-source-repositories | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elements/source-repositories/extra-data.d/98-source-repositories b/elements/source-repositories/extra-data.d/98-source-repositories index 86b1275a4..d437083d3 100755 --- a/elements/source-repositories/extra-data.d/98-source-repositories +++ b/elements/source-repositories/extra-data.d/98-source-repositories @@ -53,7 +53,7 @@ function get_repos_for_element(){ if [ ! -e "$CACHE_PATH" ] ; then mv -n $OLD_CACHE_PATH $CACHE_PATH else - echo "Not replacing new cache location with old cache" && return 1 + echo "Not replacing new cache location with old cache" fi fi @@ -164,7 +164,7 @@ 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 + echo "Not replacing new cache location with old cache" fi fi mkdir -p $CACHE_BASE