aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:57:49 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:57:49 +0100
commitdb912317e5772a943818ba85238af5d5acce85c5 (patch)
tree42a3edbb26316eee04a8f7c841779c2032159dc5 /paludis
parent60d01bc8905290a4575ee218abd8cb2b547b5608 (diff)
downloadpaludis-db912317e5772a943818ba85238af5d5acce85c5.tar.gz
paludis-db912317e5772a943818ba85238af5d5acce85c5.tar.xz
Remove settings of provides_cache
Diffstat (limited to 'paludis')
-rw-r--r--paludis/environments/no_config/no_config_environment.cc1
-rw-r--r--paludis/environments/portage/portage_environment.cc1
-rw-r--r--paludis/repositories/e/depend_rdepend_TEST.cc1
-rw-r--r--paludis/repositories/e/e_repository_TEST_4.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_pbin.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc1
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc7
-rw-r--r--paludis/repositories/e/vdb_repository_TEST_cache.cc1
-rw-r--r--paludis/repositories/e/vdb_repository_TEST_eapis.cc2
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc1
-rw-r--r--paludis/resolver/resolver_test.cc1
11 files changed, 0 insertions, 20 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 69ba6a0bd..e256f05ec 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -325,7 +325,6 @@ Imp<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(top_level_dir.realpath()));
env->add_repository(1, RepositoryFactory::get_instance()->create(env,
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 2cf90c86e..eed785724 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -505,7 +505,6 @@ PortageEnvironment::_add_vdb_repository()
keys->insert("location", stringify(preferred_root_key()->parse_value() / "/var/db/pkg"));
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
- keys->insert("provides_cache", "/var/empty");
std::string builddir(_imp->vars->get("PORTAGE_TMPDIR"));
if (! builddir.empty())
builddir.append("/portage");
diff --git a/paludis/repositories/e/depend_rdepend_TEST.cc b/paludis/repositories/e/depend_rdepend_TEST.cc
index ccae556a1..0a7f6e318 100644
--- a/paludis/repositories/e/depend_rdepend_TEST.cc
+++ b/paludis/repositories/e/depend_rdepend_TEST.cc
@@ -116,7 +116,6 @@ TEST_P(DependRdependTest, Works)
std::shared_ptr<Map<std::string, std::string> > v_keys(std::make_shared<Map<std::string, std::string>>());
v_keys->insert("format", "vdb");
v_keys->insert("names_cache", "/var/empty");
- v_keys->insert("provides_cache", "/var/empty");
v_keys->insert("location", stringify(FSPath::cwd() / "depend_rdepend_TEST_dir" / "vdb"));
v_keys->insert("root", stringify(root));
std::shared_ptr<Repository> v_repo(VDBRepository::repository_factory_create(&env,
diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
index 051bd12e1..e8a1a569d 100644
--- a/paludis/repositories/e/e_repository_TEST_4.cc
+++ b/paludis/repositories/e/e_repository_TEST_4.cc
@@ -263,7 +263,6 @@ TEST(ERepository, EAPI4MergeType)
std::shared_ptr<Map<std::string, std::string> > v_keys(std::make_shared<Map<std::string, std::string>>());
v_keys->insert("format", "vdb");
v_keys->insert("names_cache", "/var/empty");
- v_keys->insert("provides_cache", "/var/empty");
v_keys->insert("location", stringify(FSPath::cwd() / "e_repository_TEST_4_dir" / "vdb"));
v_keys->insert("root", stringify(root));
std::shared_ptr<Repository> v_repo(VDBRepository::repository_factory_create(&env,
@@ -334,7 +333,6 @@ TEST(ERepository, EAPI4MergeTypeBin)
std::shared_ptr<Map<std::string, std::string> > v_keys(std::make_shared<Map<std::string, std::string>>());
v_keys->insert("format", "vdb");
v_keys->insert("names_cache", "/var/empty");
- v_keys->insert("provides_cache", "/var/empty");
v_keys->insert("location", stringify(FSPath::cwd() / "e_repository_TEST_4_dir" / "vdb"));
v_keys->insert("root", stringify(root));
std::shared_ptr<Repository> v_repo(VDBRepository::repository_factory_create(&env,
diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc
index ffca839f9..7ba2f7f9f 100644
--- a/paludis/repositories/e/e_repository_TEST_pbin.cc
+++ b/paludis/repositories/e/e_repository_TEST_pbin.cc
@@ -144,7 +144,6 @@ TEST_P(ERepositoryInstallEAPIPBinTest, Works)
std::shared_ptr<Map<std::string, std::string> > v_keys(std::make_shared<Map<std::string, std::string>>());
v_keys->insert("format", "vdb");
v_keys->insert("names_cache", "/var/empty");
- v_keys->insert("provides_cache", "/var/empty");
v_keys->insert("location", stringify(FSPath::cwd() / "e_repository_TEST_pbin_dir" / "vdb"));
v_keys->insert("root", stringify(root));
std::shared_ptr<Repository> v_repo(VDBRepository::repository_factory_create(&env,
@@ -244,7 +243,6 @@ TEST(Symlinks, Works)
std::shared_ptr<Map<std::string, std::string> > v_keys(std::make_shared<Map<std::string, std::string>>());
v_keys->insert("format", "vdb");
v_keys->insert("names_cache", "/var/empty");
- v_keys->insert("provides_cache", "/var/empty");
v_keys->insert("location", stringify(FSPath::cwd() / "e_repository_TEST_pbin_dir" / "vdb"));
v_keys->insert("root", stringify(root));
std::shared_ptr<Repository> v_repo(VDBRepository::repository_factory_create(&env,
diff --git a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
index 007e9d3f1..5f8ce76b7 100644
--- a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
+++ b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
@@ -111,7 +111,6 @@ TEST(ERepository, SymlinkRewriting)
keys = std::make_shared<Map<std::string, std::string>>();
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "vdb"));
keys->insert("builddir", stringify(FSPath::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "build"));
keys->insert("root", stringify(FSPath(stringify(FSPath::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "root")).realpath()));
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 5458320df..b1c764646 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -154,7 +154,6 @@ TEST(VDBRepository, RepoName)
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");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "repo1"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "build"));
std::shared_ptr<Repository> repo(VDBRepository::VDBRepository::repository_factory_create(&env,
@@ -168,7 +167,6 @@ TEST(VDBRepository, HasCategoryNamed)
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");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "repo1"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "build"));
std::shared_ptr<Repository> repo(VDBRepository::VDBRepository::repository_factory_create(&env,
@@ -185,7 +183,6 @@ TEST(VDBRepository, QueryUse)
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");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "repo1"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "build"));
std::shared_ptr<Repository> repo(VDBRepository::VDBRepository::repository_factory_create(&env,
@@ -214,7 +211,6 @@ TEST(VDBRepository, Contents)
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");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "repo1"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "build"));
keys->insert("world", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "world-no-match-no-eol"));
@@ -297,7 +293,6 @@ TEST(VDBRepository, Reinstall)
keys = std::make_shared<Map<std::string, std::string>>();
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "reinstalltest"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "build"));
keys->insert("root", stringify(FSPath("vdb_repository_TEST_dir/root").realpath()));
@@ -371,7 +366,6 @@ TEST(VDBRepository, PhaseOrdering)
keys = std::make_shared<Map<std::string, std::string>>();
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "postinsttest"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "build"));
keys->insert("root", stringify(FSPath("vdb_repository_TEST_dir/root").realpath()));
@@ -479,7 +473,6 @@ TEST(VDBRepository, RemoveStaleFiles)
keys = std::make_shared<Map<std::string, std::string>>();
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "removestalefilesvdb"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_dir" / "build"));
keys->insert("root", stringify(FSPath("vdb_repository_TEST_dir/root").realpath()));
diff --git a/paludis/repositories/e/vdb_repository_TEST_cache.cc b/paludis/repositories/e/vdb_repository_TEST_cache.cc
index 9e630b773..64b3118ba 100644
--- a/paludis/repositories/e/vdb_repository_TEST_cache.cc
+++ b/paludis/repositories/e/vdb_repository_TEST_cache.cc
@@ -154,7 +154,6 @@ TEST(NamesCache, Incremental)
keys = std::make_shared<Map<std::string, std::string>>();
keys->insert("format", "vdb");
keys->insert("names_cache", stringify(names_cache.dirname()));
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_cache_dir" / "namesincrtest"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_cache_dir" / "build"));
keys->insert("root", stringify(FSPath("vdb_repository_TEST_cache_dir/root").realpath()));
diff --git a/paludis/repositories/e/vdb_repository_TEST_eapis.cc b/paludis/repositories/e/vdb_repository_TEST_eapis.cc
index e9adab416..cc9b6bedf 100644
--- a/paludis/repositories/e/vdb_repository_TEST_eapis.cc
+++ b/paludis/repositories/e/vdb_repository_TEST_eapis.cc
@@ -123,7 +123,6 @@ TEST_P(PhasesTest, Works)
keys = std::make_shared<Map<std::string, std::string>>();
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_eapis_dir" / "dstrepo"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_eapis_dir" / "build"));
keys->insert("root", stringify(FSPath("vdb_repository_TEST_eapis_dir/root").realpath()));
@@ -249,7 +248,6 @@ TEST_P(VarsTest, Works)
keys = std::make_shared<Map<std::string, std::string>>();
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_repository_TEST_eapis_dir" / "dstrepo"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_repository_TEST_eapis_dir" / "build"));
keys->insert("root", stringify(FSPath("vdb_repository_TEST_eapis_dir/root").realpath()));
diff --git a/paludis/repositories/e/vdb_unmerger_TEST.cc b/paludis/repositories/e/vdb_unmerger_TEST.cc
index 0482761af..949c09f91 100644
--- a/paludis/repositories/e/vdb_unmerger_TEST.cc
+++ b/paludis/repositories/e/vdb_unmerger_TEST.cc
@@ -111,7 +111,6 @@ namespace
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");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / "vdb_unmerger_TEST_dir" / "repo"));
keys->insert("builddir", stringify(FSPath::cwd() / "vdb_unmerger_TEST_dir" / "build"));
repo = VDBRepository::repository_factory_create(&env, std::bind(from_keys, keys, std::placeholders::_1));
diff --git a/paludis/resolver/resolver_test.cc b/paludis/resolver/resolver_test.cc
index 492577ea7..8bb6b344d 100644
--- a/paludis/resolver/resolver_test.cc
+++ b/paludis/resolver/resolver_test.cc
@@ -119,7 +119,6 @@ ResolverTestData::ResolverTestData(const std::string & t, const std::string & e,
keys = std::make_shared<Map<std::string, std::string>>();
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
- keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(FSPath::cwd() / ("resolver_TEST_" + t + "_dir") / "installed"));
keys->insert("builddir", stringify(FSPath::cwd() / ("resolver_TEST_" + t + "_dir") / "build"));
inst_repo = RepositoryFactory::get_instance()->create(&env,