aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2009-01-27 18:23:45 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2009-01-27 18:23:45 +0000
commita0f1d7f5c85c533c5914382d678be20b0fe2d896 (patch)
treed131d89deccdc5c292270af091e0902c10bad1e3
parentafbba3f9f61c274306916368e4f22d1a63060448 (diff)
downloadpaludis-a0f1d7f5c85c533c5914382d678be20b0fe2d896.tar.gz
paludis-a0f1d7f5c85c533c5914382d678be20b0fe2d896.tar.xz
Make adjutrix etc work on a standalone repository even when it's specified as the master (in ADJUTRIX_OPTIONS etc)
Already did this back in bbb8d84a9afb74cb1ad0c33143d977ad63daef3e, but ciaranm broke it. :-(
-rw-r--r--paludis/environments/no_config/no_config_environment.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 06e3185..48a5953 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -227,6 +227,8 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
std::tr1::bind(&from_keys, keys, std::tr1::placeholders::_1));
RepositoryName name(RepositoryFactory::get_instance()->name(env, repo_func));
+ if (ignored_one && r->second && stringify(name) == params.master_repository_name())
+ keys->erase(std::string("master_repository"));
if (! repo_configs.insert(std::make_pair(name, repo_func)).second)
{
Log::get_instance()->message("no_config_environment.repositories.duplicate", ll_warning, lc_context)