aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ɓukasz Michalik <lmi@ift.uni.wroc.pl> 2008-06-24 01:17:00 +0200
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-06-28 00:47:01 +0100
commit802298f25d62d17939e0c706ae4ebc9298c22408 (patch)
treec47da11a36074b1017276d73d4c33b975a2d48f4
parent8d653af9d4c2bc10ccd2ec89f5c43a01914d47bf (diff)
downloadpaludis-802298f25d62d17939e0c706ae4ebc9298c22408.tar.gz
paludis-802298f25d62d17939e0c706ae4ebc9298c22408.tar.xz
Make builddir be inherited from master repository
-rw-r--r--paludis/repositories/e/make_ebuild_repository.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/paludis/repositories/e/make_ebuild_repository.cc b/paludis/repositories/e/make_ebuild_repository.cc
index 8bbe700..d157c01 100644
--- a/paludis/repositories/e/make_ebuild_repository.cc
+++ b/paludis/repositories/e/make_ebuild_repository.cc
@@ -228,8 +228,11 @@ paludis::make_ebuild_repository(
if (m->end() == m->find("builddir") || ((builddir = m->find("builddir")->second)).empty())
{
if (m->end() == m->find("buildroot") || ((builddir = m->find("buildroot")->second)).empty())
- builddir = (*DistributionData::get_instance()->distribution_from_string(
- env->distribution()))[k::default_ebuild_builddir()];
+ if (master_repository)
+ builddir = stringify(master_repository->params().builddir);
+ else
+ builddir = (*DistributionData::get_instance()->distribution_from_string(
+ env->distribution()))[k::default_ebuild_builddir()];
else
Log::get_instance()->message("e.ebuild.configuration.deprecated", ll_warning, lc_context)
<< "Key 'buildroot' is deprecated, use 'builddir' instead";