aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2009-06-01 21:51:03 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2009-06-04 18:31:53 +0100
commitb051570edf25775bcc1563f5bc1c3e8c4c14d3cf (patch)
tree7a42f221d590d4cfad1bb874071807fbf5e9f4da
parent189d733ca686f8634cdeae40341b12d2da65480b (diff)
downloadpaludis-b051570edf25775bcc1563f5bc1c3e8c4c14d3cf.tar.gz
paludis-b051570edf25775bcc1563f5bc1c3e8c4c14d3cf.tar.xz
Don't decompress the environment file in the vdb / exndbam directory
-rw-r--r--paludis/repositories/e/ebuild/0/builtin_initmisc.bash2
-rw-r--r--paludis/repositories/e/exndbam_repository.cc5
-rw-r--r--paludis/repositories/e/vdb_repository.cc5
3 files changed, 7 insertions, 5 deletions
diff --git a/paludis/repositories/e/ebuild/0/builtin_initmisc.bash b/paludis/repositories/e/ebuild/0/builtin_initmisc.bash
index db9b42f..fca2742 100644
--- a/paludis/repositories/e/ebuild/0/builtin_initmisc.bash
+++ b/paludis/repositories/e/ebuild/0/builtin_initmisc.bash
@@ -54,7 +54,7 @@ builtin_initmisc()
rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove previous work"
fi
- export T="${PALUDIS_PACKAGE_BUILDDIR}"
+ export T="${PALUDIS_PACKAGE_BUILDDIR}/temp/"
mkdir -p "${T}" || die "Couldn't create \$T (\"${T}\")"
export HOME="${T}"
export TMPDIR="${T}"
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index f9be764..c810636 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -537,6 +537,7 @@ ExndbamRepository::perform_uninstall(
}
else
{
+ FSEntry package_builddir(_imp->params.builddir() / (stringify(id->name().category()) + "-" + stringify(id->name().package()) + "-" + stringify(id->version()) + "-uninstall"));
EbuildCommandParams params(
make_named_values<EbuildCommandParams>(
value_for<n::builddir>(_imp->params.builddir()),
@@ -550,7 +551,7 @@ ExndbamRepository::perform_uninstall(
value_for<n::exlibsdirs>(make_shared_ptr(new FSEntrySequence)),
value_for<n::files_dir>(ver_dir),
value_for<n::maybe_output_manager>(output_manager),
- value_for<n::package_builddir>(_imp->params.builddir() / (stringify(id->name().category()) + "-" + stringify(id->name().package()) + "-" + stringify(id->version()) + "-uninstall")),
+ value_for<n::package_builddir>(package_builddir),
value_for<n::package_id>(id),
value_for<n::portdir>(_imp->params.location()),
value_for<n::sandbox>(phase->option("sandbox")),
@@ -560,7 +561,7 @@ ExndbamRepository::perform_uninstall(
EbuildUninstallCommandParams uninstall_params(
make_named_values<EbuildUninstallCommandParams>(
value_for<n::load_environment>(load_env.get()),
- value_for<n::loadsaveenv_dir>(ver_dir),
+ value_for<n::loadsaveenv_dir>(package_builddir / "temp"),
value_for<n::replaced_by>(a.options.if_for_install_id()),
value_for<n::root>(stringify(_imp->params.root())),
value_for<n::unmerge_only>(false)
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 42b25f7..171aa5f 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -459,6 +459,7 @@ VDBRepository::perform_uninstall(
}
else
{
+ FSEntry package_builddir(_imp->params.builddir() / (stringify(id->name().category()) + "-" + stringify(id->name().package()) + "-" + stringify(id->version()) + "-uninstall"));
EbuildCommandParams params(make_named_values<EbuildCommandParams>(
value_for<n::builddir>(_imp->params.builddir()),
value_for<n::clearenv>(phase->option("clearenv")),
@@ -471,7 +472,7 @@ VDBRepository::perform_uninstall(
value_for<n::exlibsdirs>(make_shared_ptr(new FSEntrySequence)),
value_for<n::files_dir>(pkg_dir),
value_for<n::maybe_output_manager>(output_manager),
- value_for<n::package_builddir>(_imp->params.builddir() / (stringify(id->name().category()) + "-" + stringify(id->name().package()) + "-" + stringify(id->version()) + "-uninstall")),
+ value_for<n::package_builddir>(package_builddir),
value_for<n::package_id>(id),
value_for<n::portdir>(_imp->params.location()),
value_for<n::sandbox>(phase->option("sandbox")),
@@ -480,7 +481,7 @@ VDBRepository::perform_uninstall(
EbuildUninstallCommandParams uninstall_params(make_named_values<EbuildUninstallCommandParams>(
value_for<n::load_environment>(load_env.get()),
- value_for<n::loadsaveenv_dir>(pkg_dir),
+ value_for<n::loadsaveenv_dir>(package_builddir / "temp"),
value_for<n::replaced_by>(a.options.if_for_install_id()),
value_for<n::root>(stringify(_imp->params.root())),
value_for<n::unmerge_only>(false)