aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-08-08 20:29:30 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-08-08 20:29:30 +0000
commit1376539e3ac374c686a17d0a2eec3a01003cd165 (patch)
tree69e7972689791b7d4e4b5551bd62a6fe9658134f
parent1cb53b2555fae388a480f353ee1aa597f93839f0 (diff)
downloadpaludis-1376539e3ac374c686a17d0a2eec3a01003cd165.tar.gz
paludis-1376539e3ac374c686a17d0a2eec3a01003cd165.tar.xz
Disable cache for QA
-rw-r--r--paludis/environments/no_config/no_config_environment.cc6
-rw-r--r--paludis/environments/no_config/no_config_environment.sr1
-rw-r--r--paludis/environments/no_config/no_config_environment_TEST.cc1
-rw-r--r--python/environment.cc2
-rw-r--r--ruby/environment.cc1
-rw-r--r--src/clients/adjutrix/adjutrix.cc1
-rw-r--r--src/clients/qualudis/qualudis.cc1
7 files changed, 12 insertions, 1 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index c3bfa0d..3c294db 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -153,6 +153,8 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
keys->insert("profiles", "/var/empty");
keys->insert("write_cache", stringify(params.write_cache));
keys->insert("names_cache", "/var/empty");
+ if (params.disable_metadata_cache)
+ keys->insert("cache", "/var/empty");
package_database->add_repository(1, ((master_repo =
RepositoryMaker::get_instance()->find_maker("ebuild")(env, keys))));
@@ -166,6 +168,10 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
keys->insert("profiles", "/var/empty");
keys->insert("write_cache", stringify(params.write_cache));
keys->insert("names_cache", "/var/empty");
+
+ if (params.disable_metadata_cache)
+ keys->insert("cache", "/var/empty");
+
if (FSEntry("/var/empty") != params.master_repository_dir)
keys->insert("master_repository", stringify(master_repo->name()));
diff --git a/paludis/environments/no_config/no_config_environment.sr b/paludis/environments/no_config/no_config_environment.sr
index badbadf..ac5f514 100644
--- a/paludis/environments/no_config/no_config_environment.sr
+++ b/paludis/environments/no_config/no_config_environment.sr
@@ -7,6 +7,7 @@ make_class_Params()
key repository_dir "FSEntry"
key write_cache "FSEntry"
+ key disable_metadata_cache bool
key accept_unstable bool
key repository_type no_config_environment::RepositoryType
key master_repository_dir "FSEntry"
diff --git a/paludis/environments/no_config/no_config_environment_TEST.cc b/paludis/environments/no_config/no_config_environment_TEST.cc
index ec7b4af..75c26bd 100644
--- a/paludis/environments/no_config/no_config_environment_TEST.cc
+++ b/paludis/environments/no_config/no_config_environment_TEST.cc
@@ -37,6 +37,7 @@ namespace test_cases
.write_cache(FSEntry("/var/empty"))
.accept_unstable(false)
.repository_type(no_config_environment::ncer_auto)
+ .disable_metadata_cache(false)
.master_repository_dir(FSEntry("/var/empty")));
TEST_CHECK(e.package_database());
diff --git a/python/environment.cc b/python/environment.cc
index 5e4ac76..34419de 100644
--- a/python/environment.cc
+++ b/python/environment.cc
@@ -37,7 +37,7 @@ struct NoConfigEnvironmentWrapper :
{
NoConfigEnvironmentWrapper(const FSEntry & env_dir, const FSEntry & cache_dir,
const FSEntry & master_repo_dir) :
- NoConfigEnvironment(no_config_environment::Params(env_dir, cache_dir, false,
+ NoConfigEnvironment(no_config_environment::Params(env_dir, cache_dir, false, false,
no_config_environment::ncer_auto, master_repo_dir)
)
{
diff --git a/ruby/environment.cc b/ruby/environment.cc
index 6a291cf..6fc3629 100644
--- a/ruby/environment.cc
+++ b/ruby/environment.cc
@@ -310,6 +310,7 @@ namespace
.repository_dir(FSEntry(path))
.write_cache(write_cache)
.accept_unstable(false)
+ .disable_metadata_cache(false)
.repository_type(no_config_environment::ncer_auto)
.master_repository_dir(FSEntry(master_repository_dir))));
VALUE tdata(Data_Wrap_Struct(self, 0, &Common<tr1::shared_ptr<NoConfigEnvironment> >::free, e));
diff --git a/src/clients/adjutrix/adjutrix.cc b/src/clients/adjutrix/adjutrix.cc
index df9e2cc..611b013 100644
--- a/src/clients/adjutrix/adjutrix.cc
+++ b/src/clients/adjutrix/adjutrix.cc
@@ -152,6 +152,7 @@ main(int argc, char *argv[])
.repository_type(
(CommandLine::get_instance()->a_reverse_deps.specified()) ? no_config_environment::ncer_auto :
no_config_environment::ncer_ebuild)
+ .disable_metadata_cache(false)
.master_repository_dir(FSEntry("/var/empty")));
if (CommandLine::get_instance()->a_find_stable_candidates.specified())
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index bc74e59..97e5a32 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -113,6 +113,7 @@ int main(int argc, char *argv[])
.accept_unstable(false)
.repository_type(no_config_environment::ncer_ebuild)
.master_repository_dir(QualudisCommandLine::get_instance()->a_master_repository_dir.argument())
+ .disable_metadata_cache(true)
));
if (! env->main_repository()->qa_interface)