From f731f0854078ee09e036b9af71446a76dbdfab09 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 7 Jul 2011 18:07:08 +0200 Subject: [PATCH] xbps-src: for meta-templates always set no{extract,fetch}. --- xbps-src/shutils/extract_funcs.sh | 10 ---------- xbps-src/shutils/tmpl_funcs.sh.in | 13 +++++-------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/xbps-src/shutils/extract_funcs.sh b/xbps-src/shutils/extract_funcs.sh index edd314d11e..f427c66aaf 100644 --- a/xbps-src/shutils/extract_funcs.sh +++ b/xbps-src/shutils/extract_funcs.sh @@ -40,16 +40,6 @@ extract_distfiles() # [ -n "$pkg" -a -z "$pkgname" ] && return 1 - # - # There's nothing of interest if we are a meta template. - # - [ "$build_style" = "meta-template" ] && return 0 - - if [ -n "$revision" ]; then - lver="${version}_${revision}" - else - lver="${version}" - fi # # If noextract is set, do a "fake extraction". # diff --git a/xbps-src/shutils/tmpl_funcs.sh.in b/xbps-src/shutils/tmpl_funcs.sh.in index 42935e977e..0be7cdc7cb 100644 --- a/xbps-src/shutils/tmpl_funcs.sh.in +++ b/xbps-src/shutils/tmpl_funcs.sh.in @@ -219,16 +219,13 @@ prepare_tmpl() { local REQ_VARS i found - # - # There's nothing of interest if we are a meta template. - # - if [ "$build_style" = "meta-template" ]; then - set_tmpl_common_vars - return 0 - fi - REQ_VARS="pkgname version build_style short_desc long_desc" + if [ "$build_style" = "meta-template" ]; then + nofetch=yes + noextract=yes + fi + # Check if required vars weren't set. for i in ${REQ_VARS}; do eval val="\$$i"