From ff49f2b52a941aba5804a0747f8b51d75be72c07 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 23 Nov 2009 02:13:21 +0000
Subject: [PATCH] shutils/metadata.sh: fix multiple inclusion of subpkg
 templates.

--HG--
extra : convert_revision : 2a1d8c9996d1790817c672e66293be3b63480768
---
 xbps-src/shutils/metadata.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh
index 63e598a6882..077f4099a05 100644
--- a/xbps-src/shutils/metadata.sh
+++ b/xbps-src/shutils/metadata.sh
@@ -46,19 +46,18 @@ xbps_write_metadata_pkg()
 		else
 			spkgrev="${subpkg}-${version}"
 		fi
+		unset run_depends conf_files noarch triggers replaces \
+			revision openrc_services essential keep_empty_dirs
 		check_installed_pkg ${spkgrev}
 		[ $? -eq 0 ] && continue
 
 		if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then
-			msg_error "Cannot find subpackage build template!"
+			msg_error "Cannot find subpkg '${subpkg}' build template!"
 		fi
-		unset run_depends conf_files noarch triggers replaces \
-			revision openrc_services essential keep_empty_dirs
-		. $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template
 		pkgname=${subpkg}
 		set_tmpl_common_vars
 		xbps_write_metadata_pkg_real
-		run_template ${sourcepkg}
+		setup_tmpl ${sourcepkg}
 	done
 
 	if [ "$build_style" = "meta-template" -a -z "${run_depends}" ]; then