aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/e/depend_rdepend_TEST.cc3
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc21
-rw-r--r--paludis/repositories/e/e_repository_TEST_0.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_1.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_2.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_3.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_4.cc4
-rw-r--r--paludis/repositories/e/e_repository_TEST_ever.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_exheres_0.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_exlibs.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_pbin.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_phases.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_replacing.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc1
-rw-r--r--paludis/repositories/e/eapis/0.conf4
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf4
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf4
-rw-r--r--paludis/repositories/e/eapis/pbin-1+0.conf2
-rw-r--r--paludis/repositories/e/eapis/pbin-1+1.conf2
-rw-r--r--paludis/repositories/e/eapis/pbin-1+2.conf2
-rw-r--r--paludis/repositories/e/eapis/pbin-1+3.conf2
-rw-r--r--paludis/repositories/e/eapis/pbin-1+4.conf2
-rw-r--r--paludis/repositories/e/eapis/pbin-1+exheres-0.conf2
-rw-r--r--paludis/repositories/e/eapis/pbin-1+paludis-1.conf2
-rw-r--r--paludis/repositories/e/ebuild.cc4
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc43
-rw-r--r--paludis/repositories/e/exndbam_repository_TEST.cc1
-rw-r--r--paludis/repositories/e/fetch_visitor.cc1
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc6
-rw-r--r--paludis/repositories/e/vdb_repository_TEST_cache.cc3
-rw-r--r--paludis/repositories/e/vdb_repository_TEST_eapis.cc2
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc1
32 files changed, 14 insertions, 112 deletions
diff --git a/paludis/repositories/e/depend_rdepend_TEST.cc b/paludis/repositories/e/depend_rdepend_TEST.cc
index 849c2a0b4..f1bf6ee98 100644
--- a/paludis/repositories/e/depend_rdepend_TEST.cc
+++ b/paludis/repositories/e/depend_rdepend_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2009, 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -103,7 +103,6 @@ namespace
#endif
TestEnvironment env;
- env.set_paludis_command("/bin/false");
FSPath root(FSPath::cwd() / "depend_rdepend_TEST_dir" / "root");
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 97ec8b241..39ad42a2e 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -99,7 +99,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -119,7 +118,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -139,7 +137,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -159,7 +156,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -188,7 +184,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -219,7 +214,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -256,7 +250,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -297,7 +290,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -347,7 +339,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -380,7 +371,6 @@ namespace test_cases
using namespace std::placeholders;
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -426,7 +416,6 @@ namespace test_cases
using namespace std::placeholders;
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -479,7 +468,6 @@ namespace test_cases
TestMessageSuffix opass_suffix("opass=" + stringify(opass), true);
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -561,7 +549,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -605,7 +592,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -685,7 +671,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys18(std::make_shared<Map<std::string, std::string>>());
keys18->insert("format", "e");
@@ -742,7 +727,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -777,7 +761,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -819,7 +802,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -867,7 +849,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -913,7 +894,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "exheres");
keys->insert("names_cache", "/var/empty");
@@ -1026,7 +1006,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_0.cc b/paludis/repositories/e/e_repository_TEST_0.cc
index 010f1b799..99eb4a710 100644
--- a/paludis/repositories/e/e_repository_TEST_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_0.cc
@@ -108,7 +108,6 @@ namespace test_cases
#endif
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
diff --git a/paludis/repositories/e/e_repository_TEST_1.cc b/paludis/repositories/e/e_repository_TEST_1.cc
index a78be24c9..b25028c0d 100644
--- a/paludis/repositories/e/e_repository_TEST_1.cc
+++ b/paludis/repositories/e/e_repository_TEST_1.cc
@@ -102,7 +102,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_2.cc b/paludis/repositories/e/e_repository_TEST_2.cc
index c194837a3..54db72039 100644
--- a/paludis/repositories/e/e_repository_TEST_2.cc
+++ b/paludis/repositories/e/e_repository_TEST_2.cc
@@ -102,7 +102,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_3.cc b/paludis/repositories/e/e_repository_TEST_3.cc
index f6ce41c00..45d186c45 100644
--- a/paludis/repositories/e/e_repository_TEST_3.cc
+++ b/paludis/repositories/e/e_repository_TEST_3.cc
@@ -102,7 +102,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
index 33b3151e9..3492f6534 100644
--- a/paludis/repositories/e/e_repository_TEST_4.cc
+++ b/paludis/repositories/e/e_repository_TEST_4.cc
@@ -103,7 +103,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -265,7 +264,6 @@ namespace test_cases
FSPath root(FSPath::cwd() / "e_repository_TEST_4_dir" / "root");
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -332,7 +330,6 @@ namespace test_cases
FSPath root(FSPath::cwd() / "e_repository_TEST_4_dir" / "root");
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -438,7 +435,6 @@ namespace test_cases
FSPath root(FSPath::cwd() / "e_repository_TEST_4_dir" / "root");
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index e093ef448..5aa7813e0 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -110,7 +110,6 @@ namespace
::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "", 1);
#endif
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index 1d4a9fea6..3eea8c5a4 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -107,7 +107,6 @@ namespace test_cases
::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "", 1);
#endif
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_exlibs.cc b/paludis/repositories/e/e_repository_TEST_exlibs.cc
index 9e5e0fda4..505f220c9 100644
--- a/paludis/repositories/e/e_repository_TEST_exlibs.cc
+++ b/paludis/repositories/e/e_repository_TEST_exlibs.cc
@@ -118,7 +118,6 @@ namespace
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc
index aa0c5ebaa..c27bca9e4 100644
--- a/paludis/repositories/e/e_repository_TEST_pbin.cc
+++ b/paludis/repositories/e/e_repository_TEST_pbin.cc
@@ -109,7 +109,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
FSPath root(FSPath::cwd() / "e_repository_TEST_pbin_dir" / "root");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index 54fe4f039..29728e89a 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -118,7 +118,6 @@ namespace
::setenv("PALUDIS_ENABLE_VIRTUALS_REPOSITORY", "", 1);
#endif
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_replacing.cc b/paludis/repositories/e/e_repository_TEST_replacing.cc
index 53b4b12ce..93b8defc2 100644
--- a/paludis/repositories/e/e_repository_TEST_replacing.cc
+++ b/paludis/repositories/e/e_repository_TEST_replacing.cc
@@ -113,7 +113,6 @@ namespace
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
index 258a899b9..19861d100 100644
--- a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
+++ b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
@@ -102,7 +102,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index bd9f700cc..9bf100b6c 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -55,7 +55,7 @@ binary_from_env_variables = \
non_empty_variables = \
P PV PR PN PVR PF CATEGORY build:FILESDIR build:ECLASSDIR build:PORTDIR \
build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- build:USERLAND build:KERNEL build:ARCH PALUDIS_COMMAND ROOT PALUDIS_PACKAGE_BUILDDIR
+ build:USERLAND build:KERNEL build:ARCH ROOT PALUDIS_PACKAGE_BUILDDIR
directory_variables = \
build:ECLASSDIR build:PORTDIR build:DISTDIR
@@ -85,7 +85,7 @@ save_unmodifiable_variables = \
SLOT EAPI KEYWORDS ROOT \
PALUDIS_TMPDIR PALUDIS_CONFIG_DIR PALUDIS_BASHRC_FILES \
PALUDIS_HOOK_DIRS PALUDIS_FETCHERS_DIRS PALUDIS_SYNCERS_DIRS \
- PALUDIS_COMMAND PALUDIS_REDUCED_UID PALUDIS_REDUCED_GID \
+ PALUDIS_REDUCED_UID PALUDIS_REDUCED_GID \
PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR PALUDIS_UTILITY_PATH_SUFFIXES \
PALUDIS_EBUILD_MODULE_SUFFIXES PALUDIS_NON_EMPTY_VARIABLES \
PALUDIS_DIRECTORY_VARIABLES PALUDIS_EBUILD_MUST_NOT_SET_VARIABLES \
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index c37a01265..dda107946 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -62,7 +62,7 @@ binary_from_env_variables = \
non_empty_variables = \
PNV PV PR PN PVR PNVR CATEGORY build:FILES build:EXLIBSDIRS build:FETCHEDDIR build:REPODIR \
PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- PALUDIS_COMMAND ROOT PALUDIS_PACKAGE_BUILDDIR
+ ROOT PALUDIS_PACKAGE_BUILDDIR
directory_variables = \
build:FETCHEDDIR build:REPODIR
@@ -113,7 +113,7 @@ save_unmodifiable_variables = \
SLOT EAPI KEYWORDS ROOT \
PALUDIS_TMPDIR PALUDIS_CONFIG_DIR PALUDIS_BASHRC_FILES \
PALUDIS_HOOK_DIRS PALUDIS_FETCHERS_DIRS PALUDIS_SYNCERS_DIRS \
- PALUDIS_COMMAND PALUDIS_REDUCED_UID PALUDIS_REDUCED_GID \
+ PALUDIS_REDUCED_UID PALUDIS_REDUCED_GID \
PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR PALUDIS_UTILITY_PATH_SUFFIXES \
PALUDIS_EBUILD_MODULE_SUFFIXES PALUDIS_NON_EMPTY_VARIABLES \
PALUDIS_DIRECTORY_VARIABLES PALUDIS_EBUILD_MUST_NOT_SET_VARIABLES \
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index 7416c6181..bdfcbe756 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -56,7 +56,7 @@ binary_from_env_variables = \
non_empty_variables = \
P PV PR PN PVR PF CATEGORY build:FILESDIR build:ECLASSDIR build:PORTDIR \
build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- build:USERLAND build:KERNEL build:ARCH PALUDIS_COMMAND ROOT PALUDIS_PACKAGE_BUILDDIR
+ build:USERLAND build:KERNEL build:ARCH ROOT PALUDIS_PACKAGE_BUILDDIR
directory_variables = \
build:ECLASSDIR build:PORTDIR build:DISTDIR
@@ -87,7 +87,7 @@ save_unmodifiable_variables = \
SLOT EAPI KEYWORDS ROOT \
PALUDIS_TMPDIR PALUDIS_CONFIG_DIR PALUDIS_BASHRC_FILES \
PALUDIS_HOOK_DIRS PALUDIS_FETCHERS_DIRS PALUDIS_SYNCERS_DIRS \
- PALUDIS_COMMAND PALUDIS_REDUCED_UID PALUDIS_REDUCED_GID \
+ PALUDIS_REDUCED_UID PALUDIS_REDUCED_GID \
PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR PALUDIS_UTILITY_PATH_SUFFIXES \
PALUDIS_EBUILD_MODULE_SUFFIXES PALUDIS_NON_EMPTY_VARIABLES \
PALUDIS_DIRECTORY_VARIABLES PALUDIS_EBUILD_MUST_NOT_SET_VARIABLES \
diff --git a/paludis/repositories/e/eapis/pbin-1+0.conf b/paludis/repositories/e/eapis/pbin-1+0.conf
index ff471d56c..c91518d73 100644
--- a/paludis/repositories/e/eapis/pbin-1+0.conf
+++ b/paludis/repositories/e/eapis/pbin-1+0.conf
@@ -13,7 +13,7 @@ has_recommended_tests = false
non_empty_variables = \
P PV PR PN PVR PF CATEGORY build:FILESDIR build:PORTDIR \
build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- build:USERLAND build:KERNEL build:ARCH PALUDIS_COMMAND ROOT
+ build:USERLAND build:KERNEL build:ARCH ROOT
directory_variables = \
build:PORTDIR build:DISTDIR
diff --git a/paludis/repositories/e/eapis/pbin-1+1.conf b/paludis/repositories/e/eapis/pbin-1+1.conf
index bfebb9032..8f09a263e 100644
--- a/paludis/repositories/e/eapis/pbin-1+1.conf
+++ b/paludis/repositories/e/eapis/pbin-1+1.conf
@@ -13,7 +13,7 @@ has_recommended_tests = false
non_empty_variables = \
P PV PR PN PVR PF CATEGORY build:FILESDIR build:PORTDIR \
build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- build:USERLAND build:KERNEL build:ARCH PALUDIS_COMMAND ROOT
+ build:USERLAND build:KERNEL build:ARCH ROOT
directory_variables = \
build:PORTDIR build:DISTDIR
diff --git a/paludis/repositories/e/eapis/pbin-1+2.conf b/paludis/repositories/e/eapis/pbin-1+2.conf
index 0c57a1457..fedc4dd09 100644
--- a/paludis/repositories/e/eapis/pbin-1+2.conf
+++ b/paludis/repositories/e/eapis/pbin-1+2.conf
@@ -13,7 +13,7 @@ has_recommended_tests = false
non_empty_variables = \
P PV PR PN PVR PF CATEGORY build:FILESDIR build:PORTDIR \
build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- build:USERLAND build:KERNEL build:ARCH PALUDIS_COMMAND ROOT
+ build:USERLAND build:KERNEL build:ARCH ROOT
directory_variables = \
build:PORTDIR build:DISTDIR
diff --git a/paludis/repositories/e/eapis/pbin-1+3.conf b/paludis/repositories/e/eapis/pbin-1+3.conf
index 60bcb9815..3515990c8 100644
--- a/paludis/repositories/e/eapis/pbin-1+3.conf
+++ b/paludis/repositories/e/eapis/pbin-1+3.conf
@@ -14,7 +14,7 @@ fix_mtimes = false
non_empty_variables = \
P PV PR PN PVR PF CATEGORY build:FILESDIR build:PORTDIR \
build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- build:USERLAND build:KERNEL build:ARCH PALUDIS_COMMAND ROOT
+ build:USERLAND build:KERNEL build:ARCH ROOT
directory_variables = \
build:PORTDIR build:DISTDIR
diff --git a/paludis/repositories/e/eapis/pbin-1+4.conf b/paludis/repositories/e/eapis/pbin-1+4.conf
index 210964c97..774445888 100644
--- a/paludis/repositories/e/eapis/pbin-1+4.conf
+++ b/paludis/repositories/e/eapis/pbin-1+4.conf
@@ -14,7 +14,7 @@ fix_mtimes = false
non_empty_variables = \
P PV PR PN PVR PF CATEGORY build:FILESDIR build:PORTDIR \
build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- build:USERLAND build:KERNEL build:ARCH PALUDIS_COMMAND ROOT
+ build:USERLAND build:KERNEL build:ARCH ROOT
directory_variables = \
build:PORTDIR build:DISTDIR
diff --git a/paludis/repositories/e/eapis/pbin-1+exheres-0.conf b/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
index 3ccfb5b4a..b5555190a 100644
--- a/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
+++ b/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
@@ -15,7 +15,7 @@ fix_mtimes = false
non_empty_variables = \
PNV PV PR PN PVR PNVR CATEGORY build:FILES build:FETCHEDDIR build:REPODIR \
PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- PALUDIS_COMMAND ROOT
+ ROOT
ignore_pivot_env_variables = \
ARCHIVES WORK WORKBASE IMAGE
diff --git a/paludis/repositories/e/eapis/pbin-1+paludis-1.conf b/paludis/repositories/e/eapis/pbin-1+paludis-1.conf
index 2a00c62fd..373914e0d 100644
--- a/paludis/repositories/e/eapis/pbin-1+paludis-1.conf
+++ b/paludis/repositories/e/eapis/pbin-1+paludis-1.conf
@@ -14,7 +14,7 @@ has_recommended_tests = false
non_empty_variables = \
P PV PR PN PVR PF CATEGORY build:FILESDIR build:PORTDIR \
build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
- build:USERLAND build:KERNEL build:ARCH PALUDIS_COMMAND ROOT
+ build:USERLAND build:KERNEL build:ARCH ROOT
ignore_pivot_env_variables = \
A S D WORKDIR IMAGE
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index e14723b9d..11b7bc648 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -175,7 +175,6 @@ EbuildCommand::operator() ()
.setenv("PALUDIS_HOOK_DIRS", join(hook_dirs->begin(), hook_dirs->end(), " "))
.setenv("PALUDIS_FETCHERS_DIRS", join(fetchers_dirs->begin(), fetchers_dirs->end(), " "))
.setenv("PALUDIS_SYNCERS_DIRS", join(syncers_dirs->begin(), syncers_dirs->end(), " "))
- .setenv("PALUDIS_COMMAND", params.environment()->paludis_command())
.setenv("PALUDIS_REDUCED_GID", stringify(params.environment()->reduced_gid()))
.setenv("PALUDIS_REDUCED_UID", stringify(params.environment()->reduced_uid()))
.setenv("PALUDIS_EBUILD_LOG_LEVEL", stringify(Log::get_instance()->log_level()))
@@ -352,7 +351,6 @@ EbuildCommand::add_portage_vars(Process & process) const
.setenv("PORTAGE_ACTUAL_DISTDIR", stringify(params.distdir()))
.setenv("PORTAGE_BASHRC", "/dev/null")
.setenv("PORTAGE_BUILDDIR", stringify(params.package_builddir()))
- .setenv("PORTAGE_CALLER", params.environment()->paludis_command())
.setenv("PORTAGE_GID", "0")
.setenv("PORTAGE_INST_GID", "0")
.setenv("PORTAGE_INST_UID", "0")
@@ -1034,7 +1032,6 @@ WriteVDBEntryCommand::operator() ()
.setenv("PALUDIS_HOOK_DIRS", join(hook_dirs->begin(), hook_dirs->end(), " "))
.setenv("PALUDIS_FETCHERS_DIRS", join(fetchers_dirs->begin(), fetchers_dirs->end(), " "))
.setenv("PALUDIS_SYNCERS_DIRS", join(syncers_dirs->begin(), syncers_dirs->end(), " "))
- .setenv("PALUDIS_COMMAND", params.environment()->paludis_command())
.setenv("PALUDIS_EBUILD_LOG_LEVEL", stringify(Log::get_instance()->log_level()))
.setenv("PALUDIS_EBUILD_DIR", getenv_with_default(env_vars::ebuild_dir, LIBEXECDIR "/paludis"))
.setenv("PALUDIS_VDB_FROM_ENV_VARIABLES",
@@ -1281,7 +1278,6 @@ WriteBinaryEbuildCommand::operator() ()
.setenv("PALUDIS_HOOK_DIRS", join(hook_dirs->begin(), hook_dirs->end(), " "))
.setenv("PALUDIS_FETCHERS_DIRS", join(fetchers_dirs->begin(), fetchers_dirs->end(), " "))
.setenv("PALUDIS_SYNCERS_DIRS", join(syncers_dirs->begin(), syncers_dirs->end(), " "))
- .setenv("PALUDIS_COMMAND", params.environment()->paludis_command())
.setenv("PALUDIS_EBUILD_LOG_LEVEL", stringify(Log::get_instance()->log_level()))
.setenv("PALUDIS_EBUILD_DIR", getenv_with_default(env_vars::ebuild_dir, LIBEXECDIR "/paludis"))
.setenv("PALUDIS_BINARY_FROM_ENV_VARIABLES",
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
index a02906b72..ba6763fd5 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
@@ -64,7 +64,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -92,7 +91,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -120,7 +118,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -149,7 +146,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -180,7 +176,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -208,7 +203,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -236,7 +230,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -264,7 +257,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -292,7 +284,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -320,7 +311,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -349,7 +339,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -377,7 +366,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -405,7 +393,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -434,7 +421,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -462,7 +448,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -490,7 +475,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -518,7 +502,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -546,7 +529,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -574,7 +556,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -602,7 +583,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -633,7 +613,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -661,7 +640,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -689,7 +667,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -716,7 +693,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -747,7 +723,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -778,7 +753,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -806,7 +780,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -834,7 +807,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -862,7 +834,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -897,7 +868,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -925,7 +895,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -953,7 +922,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -985,7 +953,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1017,7 +984,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1046,7 +1012,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1075,7 +1040,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1104,7 +1068,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1140,7 +1103,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1169,7 +1131,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1204,7 +1165,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1240,7 +1200,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1276,7 +1235,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -1314,7 +1272,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/exndbam_repository_TEST.cc b/paludis/repositories/e/exndbam_repository_TEST.cc
index cb644bbf7..21e6836ee 100644
--- a/paludis/repositories/e/exndbam_repository_TEST.cc
+++ b/paludis/repositories/e/exndbam_repository_TEST.cc
@@ -126,7 +126,6 @@ namespace test_cases
void run()
{
TestEnvironment env(FSPath("exndbam_repository_TEST_dir/root").realpath());
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/fetch_visitor.cc b/paludis/repositories/e/fetch_visitor.cc
index d5893a351..387c413f7 100644
--- a/paludis/repositories/e/fetch_visitor.cc
+++ b/paludis/repositories/e/fetch_visitor.cc
@@ -240,7 +240,6 @@ FetchVisitor::visit(const FetchableURISpecTree::NodeType<FetchableURIDepSpec>::T
.setenv("PALUDIS_HOOK_DIRS", join(hook_dirs->begin(), hook_dirs->end(), " "))
.setenv("PALUDIS_FETCHERS_DIRS", join(fetchers_dirs->begin(), fetchers_dirs->end(), " "))
.setenv("PALUDIS_SYNCERS_DIRS", join(syncers_dirs->begin(), syncers_dirs->end(), " "))
- .setenv("PALUDIS_COMMAND", _imp->env->paludis_command())
.setenv("PALUDIS_REDUCED_GID", stringify(_imp->env->reduced_gid()))
.setenv("PALUDIS_REDUCED_UID", stringify(_imp->env->reduced_uid()))
.setenv("PALUDIS_EBUILD_LOG_LEVEL", stringify(Log::get_instance()->log_level()))
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 15e8d2c2f..5d08251c6 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -97,7 +97,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
@@ -117,7 +116,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
@@ -140,7 +138,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
@@ -210,7 +207,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
@@ -275,7 +271,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -406,7 +401,6 @@ namespace test_cases
void run()
{
TestEnvironment env(FSPath(stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "root")).realpath());
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/vdb_repository_TEST_cache.cc b/paludis/repositories/e/vdb_repository_TEST_cache.cc
index 9194ad168..89cab6119 100644
--- a/paludis/repositories/e/vdb_repository_TEST_cache.cc
+++ b/paludis/repositories/e/vdb_repository_TEST_cache.cc
@@ -135,7 +135,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -384,7 +383,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys = std::make_shared<Map<std::string, std::string>>();
keys->insert("format", "vdb");
@@ -502,7 +500,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/vdb_repository_TEST_eapis.cc b/paludis/repositories/e/vdb_repository_TEST_eapis.cc
index 0544eff14..9ae972402 100644
--- a/paludis/repositories/e/vdb_repository_TEST_eapis.cc
+++ b/paludis/repositories/e/vdb_repository_TEST_eapis.cc
@@ -113,7 +113,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -243,7 +242,6 @@ namespace test_cases
void run()
{
TestEnvironment env;
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
diff --git a/paludis/repositories/e/vdb_unmerger_TEST.cc b/paludis/repositories/e/vdb_unmerger_TEST.cc
index c7e96c543..b6c331895 100644
--- a/paludis/repositories/e/vdb_unmerger_TEST.cc
+++ b/paludis/repositories/e/vdb_unmerger_TEST.cc
@@ -113,7 +113,6 @@ namespace
public:
void run()
{
- env.set_paludis_command("/bin/false");
std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");