aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-02-23 19:56:50 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-02-23 19:56:50 +0000
commit318f9e2e9120e4c8a84b95b2f59e4a0767376aa9 (patch)
tree665a907cce7bdd9a352db351b79a10826e0d3f11
parente62b68c395c127a7cfb5820c398efb05333d61de (diff)
downloadpaludis-318f9e2e9120e4c8a84b95b2f59e4a0767376aa9.tar.gz
paludis-318f9e2e9120e4c8a84b95b2f59e4a0767376aa9.tar.xz
Add PALUDIS_BASHRC_FILES to merger hook environment.
-rw-r--r--paludis/repositories/gentoo/vdb_merger.cc3
-rw-r--r--paludis/repositories/gentoo/vdb_unmerger.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/paludis/repositories/gentoo/vdb_merger.cc b/paludis/repositories/gentoo/vdb_merger.cc
index e3e1ac9..33635b3 100644
--- a/paludis/repositories/gentoo/vdb_merger.cc
+++ b/paludis/repositories/gentoo/vdb_merger.cc
@@ -88,7 +88,8 @@ VDBMerger::extend_hook(const Hook & h)
("PF", pn + "-" + pvr)
("SLOT", slot)
("CONFIG_PROTECT", _imp->options.config_protect)
- ("CONFIG_PROTECT_MASK", _imp->options.config_protect_mask);
+ ("CONFIG_PROTECT_MASK", _imp->options.config_protect_mask)
+ ("PALUDIS_BASHRC_FILES", _imp->options.environment->bashrc_files());
}
void
diff --git a/paludis/repositories/gentoo/vdb_unmerger.cc b/paludis/repositories/gentoo/vdb_unmerger.cc
index e0a6941..44839ae 100644
--- a/paludis/repositories/gentoo/vdb_unmerger.cc
+++ b/paludis/repositories/gentoo/vdb_unmerger.cc
@@ -87,7 +87,8 @@ VDBUnmerger::extend_hook(const Hook & h)
("PF", pn + "-" + pvr)
("SLOT", slot)
("CONFIG_PROTECT", _imp->options.config_protect)
- ("CONFIG_PROTECT_MASK", _imp->options.config_protect_mask);
+ ("CONFIG_PROTECT_MASK", _imp->options.config_protect_mask)
+ ("PALUDIS_BASHRC_FILES", _imp->options.environment->bashrc_files());
}
void