aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/traditional_profile.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:43:36 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:43:36 +0100
commit3ea82d7e0603bdedca519e531f2692c6f788d2e7 (patch)
treefc8fc72f98b9fc523e4d60a666e0e43825ff804d /paludis/repositories/e/traditional_profile.cc
parent282d46d06d950c3d1e8db3de7dfe939b224c694b (diff)
downloadpaludis-3ea82d7e0603bdedca519e531f2692c6f788d2e7.tar.gz
paludis-3ea82d7e0603bdedca519e531f2692c6f788d2e7.tar.xz
Remove support_old_style_virtuals
Diffstat (limited to 'paludis/repositories/e/traditional_profile.cc')
-rw-r--r--paludis/repositories/e/traditional_profile.cc31
1 files changed, 0 insertions, 31 deletions
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index d3940f4f6..f3c794af4 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -233,8 +233,6 @@ namespace
load_spec_use_file(*eapi, dir / "package.use.force", _imp->stacked_values_list.back().package_use_force);
_imp->packages_file.add_file(dir / "packages");
- if ((*DistributionData::get_instance()->distribution_from_string(_imp->env->distribution())).support_old_style_virtuals())
- _imp->virtuals_file.add_file(dir / "virtuals");
_imp->package_mask_file.add_file(dir / "package.mask");
_imp->profiles_with_parents->push_back(dir);
@@ -318,35 +316,6 @@ namespace
" failed due to exception: " << e.message() << " (" << e.what() << ")";
}
- if ((*DistributionData::get_instance()->distribution_from_string(
- _imp->env->distribution())).support_old_style_virtuals())
- try
- {
- for (TraditionalProfileFile<LineConfigFile>::ConstIterator line(_imp->virtuals_file.begin()), line_end(_imp->virtuals_file.end()) ;
- line != line_end ; ++line)
- {
- std::vector<std::string> tokens;
- tokenise_whitespace(line->second, std::back_inserter(tokens));
- if (tokens.size() < 2)
- continue;
-
- QualifiedPackageName v(tokens[0]);
- _imp->virtuals->erase(v);
- _imp->virtuals->insert(v, parse_elike_package_dep_spec(tokens[1],
- line->first->supported()->package_dep_spec_parse_options(),
- line->first->supported()->version_spec_options()));
- }
- }
- catch (const InternalError &)
- {
- throw;
- }
- catch (const Exception & e)
- {
- Log::get_instance()->message("e.profile.virtuals.failure", ll_warning, lc_context)
- << "Loading virtuals failed due to exception: " << e.message() << " (" << e.what() << ")";
- }
-
for (TraditionalProfileFile<TraditionalMaskFile>::ConstIterator line(_imp->package_mask_file.begin()), line_end(_imp->package_mask_file.end()) ;
line != line_end ; ++line)
{