diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-09 15:54:19 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-09 15:54:19 +0000 |
| commit | 87babaf85a109126a86ef1de539ebd3525d8b28d (patch) | |
| tree | a24c9c8df23fd7369e69ed59e005aa19348cc825 /trunk/lib | |
| parent | 921803921ee524645a5593424340195b310f16b3 (diff) | |
| download | simplepkg-87babaf85a109126a86ef1de539ebd3525d8b28d.tar.gz simplepkg-87babaf85a109126a86ef1de539ebd3525d8b28d.tar.bz2 | |
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
Diffstat (limited to 'trunk/lib')
| -rw-r--r-- | trunk/lib/common.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |