Do not forget to check_tmpl_vars() the origin template.
--HG-- extra : convert_revision : d0b21eb461abcc0c1458840707109ccc0e66748c
This commit is contained in:
parent
4fa5372b9a
commit
7abe1ad2af
1 changed files with 6 additions and 3 deletions
9
pkgfs.sh
9
pkgfs.sh
|
@ -35,7 +35,6 @@
|
||||||
# - Support GNU/BSD-makefile style source distribution files.
|
# - Support GNU/BSD-makefile style source distribution files.
|
||||||
# - Fix PKGFS_{C,CXX}FLAGS, aren't passed to the environment yet.
|
# - Fix PKGFS_{C,CXX}FLAGS, aren't passed to the environment yet.
|
||||||
# - Support adding filters to templates to avoid creating useless links.
|
# - Support adding filters to templates to avoid creating useless links.
|
||||||
# - Save somewhere which package was stowned and use it to process deps.
|
|
||||||
#
|
#
|
||||||
# Default path to configuration file, can be overriden
|
# Default path to configuration file, can be overriden
|
||||||
# via the environment or command line.
|
# via the environment or command line.
|
||||||
|
@ -697,16 +696,20 @@ install_tmpl()
|
||||||
check_tmpl_vars ${pkgname}
|
check_tmpl_vars ${pkgname}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Handle required dependency for this template only iff it
|
# Handle required dependency for this template iff it
|
||||||
# is not installed and if we are being invoked by a dependency.
|
# is not installed and if we are being invoked by a dependency.
|
||||||
#
|
#
|
||||||
local pkgdepf="$PKGFS_DEPSDIR/$pkgname-deps.db"
|
local pkgdepf="$PKGFS_DEPSDIR/$pkgname-deps.db"
|
||||||
if [ -r "$pkgdepf" -a -z "$doing_deps" ]; then
|
if [ -r "$pkgdepf" -a -z "$doing_deps" ]; then
|
||||||
install_dependency_tmpl ${pkgdepf}
|
install_dependency_tmpl ${pkgdepf}
|
||||||
|
#
|
||||||
|
# At this point all required deps are installed, and
|
||||||
|
# only remaining is the origin template; install it.
|
||||||
|
#
|
||||||
doing_deps=
|
doing_deps=
|
||||||
echo "Origin template: $origin_tmpl"
|
|
||||||
reset_tmpl_vars
|
reset_tmpl_vars
|
||||||
run_file ${origin_tmpl}
|
run_file ${origin_tmpl}
|
||||||
|
check_tmpl_vars ${pkgname}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$only_build" ]; then
|
if [ -n "$only_build" ]; then
|
||||||
|
|
Loading…
Reference in a new issue