diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2010-11-24 16:10:03 +0000 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2010-11-24 16:10:03 +0000 |
| commit | b86d888cf77967bce49a2b295e993f05e58a87ef (patch) | |
| tree | e4ac5b76ecf717dbe34025f3faf2792dc63382ba | |
| parent | 250773a75c9e60694bb0329df05550167642fa2b (diff) | |
| download | paludis-b86d888cf77967bce49a2b295e993f05e58a87ef.tar.gz paludis-b86d888cf77967bce49a2b295e993f05e58a87ef.tar.xz | |
Warn rather than error for self-dependent repos
| -rw-r--r-- | paludis/environments/no_config/no_config_environment.cc | 7 | ||||
| -rw-r--r-- | paludis/environments/paludis/paludis_config.cc | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc index 837e0cfed..e2d8ff8ca 100644 --- a/paludis/environments/no_config/no_config_environment.cc +++ b/paludis/environments/no_config/no_config_environment.cc @@ -259,7 +259,12 @@ Imp<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env) d != d_end ; ++d) { if (*d == r->first) - throw ConfigurationError("Repository '" + stringify(r->first) + "' requires itself"); + { + Log::get_instance()->message("no_config_environment.repositories.self_dependent", ll_warning, lc_context) + << "Repository '" + stringify(r->first) + "' incorrectly requires itself"; + continue; + } + try { repository_deps.add_edge(r->first, *d, true); diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc index ed6d8edf2..a315fbdf7 100644 --- a/paludis/environments/paludis/paludis_config.cc +++ b/paludis/environments/paludis/paludis_config.cc @@ -638,7 +638,12 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s d != d_end ; ++d) { if (*d == r->first) - throw ConfigurationError("Repository '" + stringify(r->first) + "' requires itself"); + { + Log::get_instance()->message("no_config_environment.repositories.self_dependent", ll_warning, lc_context) + << "Repository '" + stringify(r->first) + "' incorrectly requires itself"; + continue; + } + try { repository_deps.add_edge(r->first, *d, true); |