aboutsummaryrefslogtreecommitdiff
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
parent60d01bc8905290a4575ee218abd8cb2b547b5608 (diff)
downloadpaludis-db912317e5772a943818ba85238af5d5acce85c5.tar.gz
paludis-db912317e5772a943818ba85238af5d5acce85c5.tar.xz
Remove settings of provides_cache
-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
-rwxr-xr-xpython/repository_TEST_setup.sh1
-rwxr-xr-xruby/action_TEST_setup.sh1
-rwxr-xr-xruby/paludis_ruby_TEST_setup.sh1
-rwxr-xr-xruby/repository_TEST_setup.sh1
-rwxr-xr-xsrc/clients/cave/continue_on_failure_TEST_setup.sh1
-rw-r--r--vim/syntax/paludis-repositories-conf.vim4
17 files changed, 2 insertions, 27 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 69ba6a0..e256f05 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 2cf90c8..eed7857 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 ccae556..0a7f6e3 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 051bd12..e8a1a56 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 ffca839..7ba2f7f 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 007e9d3..5f8ce76 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 5458320..b1c7646 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 9e630b7..64b3118 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 e9adab4..cc9b6be 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 0482761..949c09f 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 492577e..8bb6b34 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,
diff --git a/python/repository_TEST_setup.sh b/python/repository_TEST_setup.sh
index 4b64749..9eecea3 100755
--- a/python/repository_TEST_setup.sh
+++ b/python/repository_TEST_setup.sh
@@ -19,7 +19,6 @@ cat <<END > home/.paludis/repositories/installed.conf
location = `pwd`/installed
format = vdb
names_cache = /var/empty
-provides_cache = /var/empty
builddir = `pwd`
END
diff --git a/ruby/action_TEST_setup.sh b/ruby/action_TEST_setup.sh
index c83e593..a9f75b1 100755
--- a/ruby/action_TEST_setup.sh
+++ b/ruby/action_TEST_setup.sh
@@ -19,7 +19,6 @@ cat <<END > home/.paludis/repositories/installed.conf
location = `pwd`/installed
format = vdb
names_cache = /var/empty
-provides_cache = /var/empty
builddir = `pwd`
END
diff --git a/ruby/paludis_ruby_TEST_setup.sh b/ruby/paludis_ruby_TEST_setup.sh
index 6d61f9f..33e4e8f 100755
--- a/ruby/paludis_ruby_TEST_setup.sh
+++ b/ruby/paludis_ruby_TEST_setup.sh
@@ -19,7 +19,6 @@ cat <<END > home/.paludis/repositories/installed.conf
location = `pwd`/installed
format = vdb
names_cache = /var/empty
-provides_cache = /var/empty
builddir = `pwd`
END
diff --git a/ruby/repository_TEST_setup.sh b/ruby/repository_TEST_setup.sh
index ffca5aa..542dd8e 100755
--- a/ruby/repository_TEST_setup.sh
+++ b/ruby/repository_TEST_setup.sh
@@ -20,7 +20,6 @@ cat <<END > home/.paludis/repositories/installed.conf
location = `pwd`/installed
format = vdb
names_cache = /var/empty
-provides_cache = /var/empty
builddir = `pwd`
END
diff --git a/src/clients/cave/continue_on_failure_TEST_setup.sh b/src/clients/cave/continue_on_failure_TEST_setup.sh
index 5e3bf6b..ff14d3a 100755
--- a/src/clients/cave/continue_on_failure_TEST_setup.sh
+++ b/src/clients/cave/continue_on_failure_TEST_setup.sh
@@ -43,7 +43,6 @@ cat <<END > config/.paludis-continue-on-failure-test/repositories/installed.conf
location = `pwd`/root/var/db/pkg
format = vdb
names_cache = /var/empty
-provides_cache = /var/empty
builddir = `pwd`/build
END
diff --git a/vim/syntax/paludis-repositories-conf.vim b/vim/syntax/paludis-repositories-conf.vim
index 44cf990..17a54e8 100644
--- a/vim/syntax/paludis-repositories-conf.vim
+++ b/vim/syntax/paludis-repositories-conf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Paludis repositories/*.conf files
" Author: Ciaran McCreesh
-" Copyright: Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh
+" Copyright: Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
" Licence: You may redistribute this under the same terms as Vim itself
"
" Syntax highlighting for Paludis repositories/*.conf files.
@@ -46,7 +46,7 @@ syn keyword PaludisRepositoriesConfKnownKey contained
\ location distdir format builddir library sync root yaml_uri
\ master_repository profiles pkgdir setsdir securitydir newsdir
\ names_cache sync sync_options eclassdirs cache write_cache
- \ provides_cache importance layout use_manifest
+ \ importance layout use_manifest
\ binary_uri_prefix binary_keywords_filter binary_destination binary_distdir
\ eapi_when_unspecified eapi_when_unknown profile_eapi_when_unspecified
\ name handler config_template config_filename