From 87babaf85a109126a86ef1de539ebd3525d8b28d Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 9 Apr 2007 15:54:19 +0000 Subject: simplaret: new var SIMPLARET_DOWNLOAD_FROM_NEXT_REPO git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@326 04377dda-e619-0410-9926-eae83683ac58 --- trunk/lib/common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'trunk/lib/common.sh') diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index 2680cff..f331e56 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -391,7 +391,8 @@ function search_template { TEMPLATE_BASE="$TEMPLATE_FOLDER/$1" elif [ -f "$TEMPLATE_FOLDER/$1/$1.template" ]; then TEMPLATE_BASE="$TEMPLATE_FOLDER/$1/$1" - elif [ -f "$BASE_CONF/defaults/templates/$1/$1.template" ]; then + elif [ -f "$BASE_CONF/defaults/templates/$1/$1.template" ] && \ + [ "$2" != "--update" ]; then TEMPLATE_BASE="$BASE_CONF/defaults/templates/$1/$1" else if [ "$2" == "--new" ]; then -- cgit v1.2.3