aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-08-20 11:59:55 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-08-20 11:59:55 +0000
commit8def6ebf89d41ff08ac92ad9f3fb0da8017d1660 (patch)
tree09b036838e940549b20a840aa9739d811220059b
parent2fd676ba543e9ddd26b17f13561ff85b0fa95585 (diff)
downloadpaludis-8def6ebf89d41ff08ac92ad9f3fb0da8017d1660.tar.gz
paludis-8def6ebf89d41ff08ac92ad9f3fb0da8017d1660.tar.xz
Plug more environment leakage, and unbreak SLOT-naughtiness checking.
-rw-r--r--paludis/repositories/e/ebuild.cc6
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash2
2 files changed, 5 insertions, 3 deletions
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index a574e5e..3a31be8 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -114,7 +114,6 @@ EbuildCommand::operator() ()
.with_setenv("REPOSITORY", stringify(params.package_id->repository()->name()))
.with_setenv("FILESDIR", stringify(params.files_dir))
.with_setenv("EAPI", stringify(params.package_id->eapi()->name))
- .with_setenv("SLOT", "")
.with_setenv("PKGMANAGER", PALUDIS_PACKAGE "-" + stringify(PALUDIS_VERSION_MAJOR) + "." +
stringify(PALUDIS_VERSION_MINOR) + "." +
stringify(PALUDIS_VERSION_MICRO) +
@@ -155,7 +154,10 @@ EbuildCommand::operator() ()
params.package_id->eapi()->supported->ebuild_options->must_not_change_variables)
.with_setenv("PALUDIS_RDEPEND_DEFAULTS_TO_DEPEND",
params.package_id->eapi()->supported->ebuild_options->rdepend_defaults_to_depend ? "yes" : "")
- );
+ )
+ .with_setenv("SLOT", "")
+ .with_setenv("PALUDIS_PROFILE_DIR", "")
+ .with_setenv("PALUDIS_PROFILE_DIRS", "");
if (! params.package_id->eapi()->supported->ebuild_environment_variables->env_kv.empty())
cmd.with_setenv(params.package_id->eapi()->supported->ebuild_environment_variables->env_kv, kernel_version());
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index d50e10a..16b47fb 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -320,7 +320,7 @@ ebuild_load_ebuild()
s_v="saved_${v}"
if [[ -n "${!s_v}" ]] && [[ "${!v}" != "${!s_v}" ]] ; then
ebuild_notice "qa" \
- "Ebuild ${1} illegally tried to change SLOT from '${!s_v}' to '${!v}'"
+ "Ebuild ${1} illegally tried to change ${v} from '${!s_v}' to '${!v}'"
export ${v}="${!s_v}"
fi
done