diff options
author | 2011-03-25 20:12:33 +0000 | |
---|---|---|
committer | 2011-03-26 19:00:37 +0000 | |
commit | 099a4e90c07e655b98073d8386ef5abaeec55a04 (patch) | |
tree | 0189b35286f6ccd7a341722025b047f91715420e | |
parent | 52053348fd898ecbc2fe568db26259311a24d040 (diff) | |
download | paludis-099a4e90c07e655b98073d8386ef5abaeec55a04.tar.gz paludis-099a4e90c07e655b98073d8386ef5abaeec55a04.tar.xz |
paludis_command not used
49 files changed, 19 insertions, 258 deletions
diff --git a/misc/common-makefile.am b/misc/common-makefile.am index fe613032f..a6d41cea0 100644 --- a/misc/common-makefile.am +++ b/misc/common-makefile.am @@ -56,7 +56,6 @@ LOG_COMPILER = \ `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/ \ `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gemcutter/.libs/`" \ PALUDIS_BYPASS_USERPRIV_CHECKS="yes" \ - PALUDIS_COMMAND="$(top_builddir)/src/clients/paludis/paludis" \ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \ PALUDIS_DISTRIBUTION="gentoo" \ PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \ diff --git a/paludis/environment.hh b/paludis/environment.hh index 4c791a636..8fed1491e 100644 --- a/paludis/environment.hh +++ b/paludis/environment.hh @@ -327,17 +327,6 @@ namespace paludis PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; /** - * Return the command used to launch paludis (the client). - */ - virtual std::string paludis_command() const - PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; - - /** - * Change the command used to launch paludis (the client). - */ - virtual void set_paludis_command(const std::string &) = 0; - - /** * User id to use when reduced privs are permissible. */ virtual uid_t reduced_uid() const = 0; diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc index aa308c401..000d609ea 100644 --- a/paludis/environments/no_config/no_config_environment.cc +++ b/paludis/environments/no_config/no_config_environment.cc @@ -73,8 +73,6 @@ namespace paludis std::shared_ptr<Repository> master_repo; std::list<std::shared_ptr<Repository> > extra_repos; - std::string paludis_command; - std::shared_ptr<PackageDatabase> package_database; std::shared_ptr<LiteralMetadataValueKey<std::string> > format_key; @@ -158,7 +156,6 @@ Imp<NoConfigEnvironment>::Imp( write_cache(p.write_cache()), accept_unstable(p.accept_unstable()), is_vdb(is_vdb_repository(p.repository_dir(), p.repository_type())), - paludis_command("false"), package_database(std::make_shared<PackageDatabase>(env)), format_key(std::make_shared<LiteralMetadataValueKey<std::string>>("format", "Format", mkt_significant, "no_config")), repository_dir_key(std::make_shared<LiteralMetadataValueKey<FSPath>>("repository_dir", "Repository dir", @@ -423,18 +420,6 @@ NoConfigEnvironment::package_database() const return _imp->package_database; } -std::string -NoConfigEnvironment::paludis_command() const -{ - return _imp->paludis_command; -} - -void -NoConfigEnvironment::set_paludis_command(const std::string & s) -{ - _imp->paludis_command = s; -} - bool NoConfigEnvironment::accept_keywords( const std::shared_ptr<const KeywordNameSet> & keywords, diff --git a/paludis/environments/no_config/no_config_environment.hh b/paludis/environments/no_config/no_config_environment.hh index f261b53b3..868eb37a2 100644 --- a/paludis/environments/no_config/no_config_environment.hh +++ b/paludis/environments/no_config/no_config_environment.hh @@ -168,11 +168,6 @@ namespace paludis virtual std::shared_ptr<const PackageDatabase> package_database() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::string paludis_command() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual void set_paludis_command(const std::string &); - virtual bool accept_license(const std::string &, const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc index decf0795f..1f9bc882b 100644 --- a/paludis/environments/paludis/paludis_config.cc +++ b/paludis/environments/paludis/paludis_config.cc @@ -170,7 +170,6 @@ namespace paludis { PaludisEnvironment * const env; - std::string paludis_command; std::string root; std::string system_root; std::string config_dir; @@ -212,7 +211,6 @@ namespace paludis Imp<PaludisConfig>::Imp(PaludisEnvironment * e) : env(e), - paludis_command("paludis"), config_dir("(unset)"), bashrc_files(std::make_shared<FSPathSequence>()), local_config_dir("/"), diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc index 5f0c6ba99..bfe9478f2 100644 --- a/paludis/environments/paludis/paludis_environment.cc +++ b/paludis/environments/paludis/paludis_environment.cc @@ -79,7 +79,6 @@ namespace paludis mutable std::list<std::pair<FSPath, bool> > hook_dirs; std::shared_ptr<PaludisConfig> config; - std::string paludis_command; std::shared_ptr<PackageDatabase> package_database; @@ -95,7 +94,6 @@ namespace paludis Imp(PaludisEnvironment * const e, std::shared_ptr<PaludisConfig> c) : done_hooks(false), config(c), - paludis_command("paludis"), package_database(std::make_shared<PackageDatabase>(e)), format_key(std::make_shared<LiteralMetadataValueKey<std::string>>("format", "Format", mkt_significant, "paludis")), config_location_key(std::make_shared<LiteralMetadataValueKey<FSPath>>("conf_dir", "Config dir", mkt_normal, @@ -204,18 +202,6 @@ PaludisEnvironment::bashrc_files() const return _imp->config->bashrc_files(); } -std::string -PaludisEnvironment::paludis_command() const -{ - return _imp->paludis_command; -} - -void -PaludisEnvironment::set_paludis_command(const std::string & s) -{ - _imp->paludis_command = s; -} - HookResult PaludisEnvironment::perform_hook( const Hook & hook, diff --git a/paludis/environments/paludis/paludis_environment.hh b/paludis/environments/paludis/paludis_environment.hh index 14deb9b9b..29f93081c 100644 --- a/paludis/environments/paludis/paludis_environment.hh +++ b/paludis/environments/paludis/paludis_environment.hh @@ -100,11 +100,6 @@ namespace paludis const std::shared_ptr<OutputManager> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::string paludis_command() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual void set_paludis_command(const std::string &); - virtual std::shared_ptr<PackageDatabase> package_database() PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc index 980787c36..3cd2c53c3 100644 --- a/paludis/environments/portage/portage_environment.cc +++ b/paludis/environments/portage/portage_environment.cc @@ -86,7 +86,6 @@ namespace paludis struct Imp<PortageEnvironment> { const FSPath conf_dir; - std::string paludis_command; std::shared_ptr<KeyValueConfigFile> vars; @@ -123,7 +122,6 @@ namespace paludis Imp(Environment * const e, const std::string & s) : conf_dir(FSPath(s.empty() ? "/" : s) / SYSCONFDIR), - paludis_command("paludis"), ignore_all_breaks_portage(false), done_hooks(false), overlay_importance(10), @@ -607,18 +605,6 @@ PortageEnvironment::value_for_choice_parameter( return ""; } -std::string -PortageEnvironment::paludis_command() const -{ - return _imp->paludis_command; -} - -void -PortageEnvironment::set_paludis_command(const std::string & s) -{ - _imp->paludis_command = s; -} - namespace { bool is_tilde_keyword(const KeywordName & k) diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh index a309f74df..c8ddfd28e 100644 --- a/paludis/environments/portage/portage_environment.hh +++ b/paludis/environments/portage/portage_environment.hh @@ -135,11 +135,6 @@ namespace paludis virtual std::shared_ptr<const PackageDatabase> package_database() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::string paludis_command() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual void set_paludis_command(const std::string &); - virtual bool accept_license(const std::string &, const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc index 700f9a92c..f437c9361 100644 --- a/paludis/environments/test/test_environment.cc +++ b/paludis/environments/test/test_environment.cc @@ -54,7 +54,6 @@ namespace paludis struct Imp<TestEnvironment> { std::shared_ptr<PackageDatabase> package_database; - std::string paludis_command; std::unordered_map<std::string, Tribool> override_want_choice_enabled; FSPath root; Sets sets; @@ -63,7 +62,6 @@ namespace paludis Imp(Environment * const e, const FSPath & r) : package_database(std::make_shared<PackageDatabase>(e)), - paludis_command(""), root(r), preferred_root_key(std::make_shared<LiteralMetadataValueKey<FSPath>>("root", "Root", mkt_normal, root)), system_root_key(std::make_shared<LiteralMetadataValueKey<FSPath>>("system_root", "System Root", mkt_normal, FSPath("/"))) @@ -114,18 +112,6 @@ TestEnvironment::package_database() const return _imp->package_database; } -std::string -TestEnvironment::paludis_command() const -{ - return _imp->paludis_command; -} - -void -TestEnvironment::set_paludis_command(const std::string & s) -{ - _imp->paludis_command = s; -} - const std::shared_ptr<const PackageID> TestEnvironment::fetch_package_id(const QualifiedPackageName & q, const VersionSpec & v, const RepositoryName & r) const diff --git a/paludis/environments/test/test_environment.hh b/paludis/environments/test/test_environment.hh index 7d356219e..1d49812f5 100644 --- a/paludis/environments/test/test_environment.hh +++ b/paludis/environments/test/test_environment.hh @@ -66,11 +66,6 @@ namespace paludis virtual std::shared_ptr<const PackageDatabase> package_database() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::string paludis_command() const - PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual void set_paludis_command(const std::string &); - /** * Convenience way of getting a package id. */ diff --git a/paludis/hooker.cc b/paludis/hooker.cc index 88123e14d..3aa1dc2fb 100644 --- a/paludis/hooker.cc +++ b/paludis/hooker.cc @@ -178,8 +178,7 @@ BashHookFile::run( .setenv("HOOK_LOG_LEVEL", stringify(Log::get_instance()->log_level())) .setenv("PALUDIS_EBUILD_DIR", getenv_with_default(env_vars::ebuild_dir, LIBEXECDIR "/paludis")) .setenv("PALUDIS_REDUCED_GID", stringify(_env->reduced_gid())) - .setenv("PALUDIS_REDUCED_UID", stringify(_env->reduced_uid())) - .setenv("PALUDIS_COMMAND", _env->paludis_command()); + .setenv("PALUDIS_REDUCED_UID", stringify(_env->reduced_uid())); if (hook.output_dest == hod_stdout && _run_prefixed) process @@ -240,8 +239,7 @@ FancyHookFile::run(const Hook & hook, .setenv("HOOK_LOG_LEVEL", stringify(Log::get_instance()->log_level())) .setenv("PALUDIS_EBUILD_DIR", getenv_with_default(env_vars::ebuild_dir, LIBEXECDIR "/paludis")) .setenv("PALUDIS_REDUCED_GID", stringify(_env->reduced_gid())) - .setenv("PALUDIS_REDUCED_UID", stringify(_env->reduced_uid())) - .setenv("PALUDIS_COMMAND", _env->paludis_command()); + .setenv("PALUDIS_REDUCED_UID", stringify(_env->reduced_uid())); if (hook.output_dest == hod_stdout && _run_prefixed) process @@ -301,8 +299,7 @@ FancyHookFile::auto_hook_names() const .setenv("HOOK_LOG_LEVEL", stringify(Log::get_instance()->log_level())) .setenv("PALUDIS_EBUILD_DIR", getenv_with_default(env_vars::ebuild_dir, LIBEXECDIR "/paludis")) .setenv("PALUDIS_REDUCED_GID", stringify(_env->reduced_gid())) - .setenv("PALUDIS_REDUCED_UID", stringify(_env->reduced_uid())) - .setenv("PALUDIS_COMMAND", _env->paludis_command()); + .setenv("PALUDIS_REDUCED_UID", stringify(_env->reduced_uid())); int exit_status(0); std::string output(""); @@ -360,8 +357,7 @@ FancyHookFile::_add_dependency_class(const Hook & hook, DirectedGraph<std::strin .setenv("HOOK_LOG_LEVEL", stringify(Log::get_instance()->log_level())) .setenv("PALUDIS_EBUILD_DIR", getenv_with_default(env_vars::ebuild_dir, LIBEXECDIR "/paludis")) .setenv("PALUDIS_REDUCED_GID", stringify(_env->reduced_gid())) - .setenv("PALUDIS_REDUCED_UID", stringify(_env->reduced_uid())) - .setenv("PALUDIS_COMMAND", _env->paludis_command()); + .setenv("PALUDIS_REDUCED_UID", stringify(_env->reduced_uid())); process.prefix_stderr(strip_trailing_string(file_name().basename(), ".bash") + "> "); 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"); diff --git a/paludis/set_file.cc b/paludis/set_file.cc index bc62eb6cb..5fb98923c 100644 --- a/paludis/set_file.cc +++ b/paludis/set_file.cc @@ -536,7 +536,6 @@ PaludisBashHandler::PaludisBashHandler(const SetFileParams & p) : .setenv("SET", stringify(_p.file_name())) .setenv("SET_LOG_LEVEL", stringify(Log::get_instance()->log_level())) .setenv("PALUDIS_EBUILD_DIR", getenv_with_default(env_vars::ebuild_dir, LIBEXECDIR "/paludis")) - .setenv("PALUDIS_COMMAND", _p.environment() ? _p.environment()->paludis_command() : "") .prefix_stderr(_p.file_name().basename() + "> ") .capture_stdout(s); int exit_status(process.run().wait()); diff --git a/python/additional_tests.cc b/python/additional_tests.cc index fc1d5bff4..ee0b13e5d 100644 --- a/python/additional_tests.cc +++ b/python/additional_tests.cc @@ -74,10 +74,6 @@ namespace environment e.hook_dirs(); - e.paludis_command(); - - e.set_paludis_command("paludis"); - e.reduced_uid(); e.reduced_gid(); diff --git a/python/environment.cc b/python/environment.cc index 1c2ed908a..71dca0f36 100644 --- a/python/environment.cc +++ b/python/environment.cc @@ -190,27 +190,6 @@ class EnvironmentImplementationWrapper : throw PythonMethodNotImplemented("EnvironmentImplementation", "hook_dirs"); } - virtual std::string paludis_command() const - PALUDIS_ATTRIBUTE((warn_unused_result)) - { - Lock l(get_mutex()); - - if (bp::override f = get_override("paludis_command")) - return f(); - else - throw PythonMethodNotImplemented("EnvironmentImplementation", "paludis_command"); - } - - virtual void set_paludis_command(const std::string & s) - { - Lock l(get_mutex()); - - if (bp::override f = get_override("set_paludis_command")) - f(s); - else - throw PythonMethodNotImplemented("EnvironmentImplementation", "set_paludis_command"); - } - virtual uid_t reduced_uid() const { Lock l(get_mutex()); @@ -617,16 +596,6 @@ void expose_environment() "Return directories to search for hooks." ) - .def("paludis_command", bp::pure_virtual(&EnvImp::paludis_command), - "paludis_command() -> str\n" - "Return the command used to launch paludis (the client)." - ) - - .def("set_paludis_command", bp::pure_virtual(&EnvImp::set_paludis_command), - "set_paludis_command(str)\n" - "Change the command used to launch paludis (the client)." - ) - .def("reduced_uid", bp::pure_virtual(&EnvImp::reduced_uid), "reduced_uid() -> int\n" "User id to use when reduced privs are permissible." diff --git a/python/environment_TEST.py b/python/environment_TEST.py index 54086c889..0e580eda1 100755 --- a/python/environment_TEST.py +++ b/python/environment_TEST.py @@ -109,12 +109,6 @@ class TestCase_04_Environment_subclassingd(unittest.TestCase): def hook_dirs(self): return ["/path"] - def paludis_command(self): - return "paludis" - - def set_paludis_command(self, s): - pass - def reduced_uid(self): return 0 diff --git a/src/clients/cave/cave.cc b/src/clients/cave/cave.cc index b7f55ed42..7b04e33a5 100644 --- a/src/clients/cave/cave.cc +++ b/src/clients/cave/cave.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2008, 2009, 2010 Ciaran McCreesh + * Copyright (c) 2008, 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 @@ -99,10 +99,6 @@ int main(int argc, char * argv[]) Log::get_instance()->set_log_level(cmdline.a_log_level.option()); std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create(cmdline.a_environment.argument())); - env->set_paludis_command(std::string(BINDIR"/paludis") - + " --" + cmdline.a_log_level.long_name() + " " + cmdline.a_log_level.argument() - + " --" + cmdline.a_environment.long_name() + " " + (cmdline.a_environment.argument().empty() ? ":" : cmdline.a_environment.argument())); - std::shared_ptr<Sequence<std::string> > seq(std::make_shared<Sequence<std::string>>()); std::copy(next(cmdline.begin_parameters()), cmdline.end_parameters(), seq->back_inserter()); |