aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:18:26 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:18:38 +0100
commitee28577088fc168cdf81e1b79ecdc7d7c7f4adc6 (patch)
tree8790337fe19b81f485ee63adec26173f45366316 /paludis/environments
parent9c2ee6d96bbe00dd0b77d652613c7ad5a8dea846 (diff)
downloadpaludis-ee28577088fc168cdf81e1b79ecdc7d7c7f4adc6.tar.gz
paludis-ee28577088fc168cdf81e1b79ecdc7d7c7f4adc6.tar.xz
Don't create virtuals repos
Diffstat (limited to 'paludis/environments')
-rw-r--r--paludis/environments/no_config/no_config_environment.cc18
-rw-r--r--paludis/environments/paludis/paludis_config.cc15
-rw-r--r--paludis/environments/portage/portage_environment.cc24
-rw-r--r--paludis/environments/portage/portage_environment.hh2
4 files changed, 0 insertions, 59 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 29d735aaf..69ba6a0bd 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -314,14 +314,6 @@ Imp<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
if ((! params.master_repository_name().empty()) && (! master_repo) &&
(params.master_repository_name() != stringify(main_repo->name())))
throw ConfigurationError("Can't find repository '" + params.master_repository_name() + "'");
-
-#ifdef ENABLE_VIRTUALS_REPOSITORY
- std::shared_ptr<Map<std::string, std::string> > v_keys(std::make_shared<Map<std::string, std::string>>());
- v_keys->insert("format", "virtuals");
- if ((*DistributionData::get_instance()->distribution_from_string(env->distribution())).support_old_style_virtuals())
- env->add_repository(-2, RepositoryFactory::get_instance()->create(env,
- std::bind(from_keys, v_keys, std::placeholders::_1)));
-#endif
}
else
{
@@ -338,16 +330,6 @@ Imp<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
env->add_repository(1, RepositoryFactory::get_instance()->create(env,
std::bind(from_keys, keys, std::placeholders::_1)));
-
- std::shared_ptr<Map<std::string, std::string> > iv_keys(std::make_shared<Map<std::string, std::string>>());
- iv_keys->insert("root", "/");
- iv_keys->insert("format", "installed_virtuals");
-
-#ifdef ENABLE_VIRTUALS_REPOSITORY
- if ((*DistributionData::get_instance()->distribution_from_string(env->distribution())).support_old_style_virtuals())
- env->add_repository(-2, RepositoryFactory::get_instance()->create(env,
- std::bind(from_keys, iv_keys, std::placeholders::_1)));
-#endif
}
}
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 03b5f7b33..e722cc5e5 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -654,21 +654,6 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
if (_imp->repos.empty())
throw PaludisConfigError("No repositories specified");
-
-#ifdef ENABLE_VIRTUALS_REPOSITORY
- /* add virtuals repositories */
- if ((*DistributionData::get_instance()->distribution_from_string(distribution())).support_old_style_virtuals())
- {
- std::shared_ptr<Map<std::string, std::string> > iv_keys(std::make_shared<Map<std::string, std::string>>());
- iv_keys->insert("root", _imp->root_prefix.empty() ? "/" : _imp->root_prefix);
- iv_keys->insert("format", "installed_virtuals");
- _imp->repos.push_back(std::bind(&from_keys, iv_keys, std::placeholders::_1));
-
- std::shared_ptr<Map<std::string, std::string> > v_keys(std::make_shared<Map<std::string, std::string>>());
- v_keys->insert("format", "virtuals");
- _imp->repos.push_back(std::bind(&from_keys, v_keys, std::placeholders::_1));
- }
-#endif
}
/* keywords */
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index c6a58c208..2cf90c86e 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -264,9 +264,6 @@ PortageEnvironment::PortageEnvironment(const std::string & s) :
/* TODO: load USE etc from env? */
/* repositories */
-
- _add_virtuals_repository();
- _add_installed_virtuals_repository();
if (_imp->vars->get("PORTDIR").empty())
throw PortageEnvironmentConfigurationError("PORTDIR empty or unset");
_add_portdir_repository(FSPath(_imp->vars->get("PORTDIR")));
@@ -462,27 +459,6 @@ PortageEnvironment::_load_profile(const FSPath & d)
}
void
-PortageEnvironment::_add_virtuals_repository()
-{
-#ifdef ENABLE_VIRTUALS_REPOSITORY
- std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
- keys->insert("format", "virtuals");
- add_repository(-2, RepositoryFactory::get_instance()->create(this, std::bind(from_keys, keys, std::placeholders::_1)));
-#endif
-}
-
-void
-PortageEnvironment::_add_installed_virtuals_repository()
-{
-#ifdef ENABLE_VIRTUALS_REPOSITORY
- std::shared_ptr<Map<std::string, std::string> > keys(std::make_shared<Map<std::string, std::string>>());
- keys->insert("root", stringify(preferred_root_key()->parse_value()));
- keys->insert("format", "installed_virtuals");
- add_repository(-1, RepositoryFactory::get_instance()->create(this, std::bind(from_keys, keys, std::placeholders::_1)));
-#endif
-}
-
-void
PortageEnvironment::_add_portdir_repository(const FSPath & portdir)
{
Context context("When creating PORTDIR repository:");
diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh
index e7193e0d4..4c7914af3 100644
--- a/paludis/environments/portage/portage_environment.hh
+++ b/paludis/environments/portage/portage_environment.hh
@@ -61,8 +61,6 @@ namespace paludis
Pimp<PortageEnvironment> _imp;
void _load_profile(const FSPath &);
- void _add_virtuals_repository();
- void _add_installed_virtuals_repository();
void _add_portdir_repository(const FSPath &);
void _add_portdir_overlay_repository(const FSPath &);
void _add_ebuild_repository(const FSPath &, const std::string &,