aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-10 16:11:59 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-10 16:11:59 +0100
commitbe03352b02c38243799df12153354d447ef3e3c7 (patch)
tree14c4558b27cb8ac5c6f3994660e1bc7b9ce5203d
parenta79fd4a0a7eb4ee6f2773832b5f62056a8daa0a9 (diff)
downloadpaludis-be03352b02c38243799df12153354d447ef3e3c7.tar.gz
paludis-be03352b02c38243799df12153354d447ef3e3c7.tar.xz
Use the proper output colour when writing a VDB entry/pbin.
-rw-r--r--paludis/repositories/e/ebuild.cc4
-rw-r--r--paludis/repositories/e/ebuild/write_binary_ebuild.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/write_vdb_entry.bash2
3 files changed, 6 insertions, 2 deletions
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 70c4dc6..37c01a1 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -775,6 +775,8 @@ WriteVDBEntryCommand::operator() ()
params.package_id()->eapi()->supported()->ebuild_options()->ignore_pivot_env_functions())
.with_setenv("PALUDIS_IGNORE_PIVOT_ENV_VARIABLES",
params.package_id()->eapi()->supported()->ebuild_options()->ignore_pivot_env_variables())
+ .with_setenv("PALUDIS_EBUILD_MODULE_SUFFIXES",
+ params.package_id()->eapi()->supported()->ebuild_options()->ebuild_module_suffixes())
.with_pipe_command_handler(std::tr1::bind(&pipe_command_handler, params.environment(), params.package_id(), _1))
);
@@ -978,6 +980,8 @@ WriteBinaryEbuildCommand::operator() ()
+ params.package_id()->eapi()->exported_name())->supported()->ebuild_metadata_variables()->keywords().name())
.with_setenv("PALUDIS_BINARY_DISTDIR_VARIABLE", EAPIData::get_instance()->eapi_from_string("pbin-1+"
+ params.package_id()->eapi()->exported_name())->supported()->ebuild_environment_variables()->env_distdir())
+ .with_setenv("PALUDIS_EBUILD_MODULE_SUFFIXES",
+ params.package_id()->eapi()->supported()->ebuild_options()->ebuild_module_suffixes())
.with_pipe_command_handler(std::tr1::bind(&pipe_command_handler, params.environment(), params.package_id(), _1))
);
diff --git a/paludis/repositories/e/ebuild/write_binary_ebuild.bash b/paludis/repositories/e/ebuild/write_binary_ebuild.bash
index 7614193..4907388 100644
--- a/paludis/repositories/e/ebuild/write_binary_ebuild.bash
+++ b/paludis/repositories/e/ebuild/write_binary_ebuild.bash
@@ -74,7 +74,7 @@ ebuild_load_module()
}
ebuild_load_module die_functions
-ebuild_load_module 0/output_functions
+ebuild_load_module output_functions
ebuild_load_module echo_functions
ebuild_load_module source_functions
ebuild_load_module binary_functions
diff --git a/paludis/repositories/e/ebuild/write_vdb_entry.bash b/paludis/repositories/e/ebuild/write_vdb_entry.bash
index 0a3871c..f519420 100755
--- a/paludis/repositories/e/ebuild/write_vdb_entry.bash
+++ b/paludis/repositories/e/ebuild/write_vdb_entry.bash
@@ -74,7 +74,7 @@ ebuild_load_module()
}
ebuild_load_module die_functions
-ebuild_load_module 0/output_functions
+ebuild_load_module output_functions
ebuild_load_module echo_functions
ebuild_load_module source_functions