diff options
author | 2011-06-11 23:43:36 +0100 | |
---|---|---|
committer | 2011-06-11 23:43:36 +0100 | |
commit | 3ea82d7e0603bdedca519e531f2692c6f788d2e7 (patch) | |
tree | fc8fc72f98b9fc523e4d60a666e0e43825ff804d | |
parent | 282d46d06d950c3d1e8db3de7dfe939b224c694b (diff) | |
download | paludis-3ea82d7e0603bdedca519e531f2692c6f788d2e7.tar.gz paludis-3ea82d7e0603bdedca519e531f2692c6f788d2e7.tar.xz |
Remove support_old_style_virtuals
-rw-r--r-- | paludis/distribution.cc | 3 | ||||
-rw-r--r-- | paludis/distribution.hh | 2 | ||||
-rw-r--r-- | paludis/distributions/exherbo.conf | 1 | ||||
-rw-r--r-- | paludis/distributions/gentoo.conf | 1 | ||||
-rw-r--r-- | paludis/repositories/e/traditional_profile.cc | 31 |
5 files changed, 1 insertions, 37 deletions
diff --git a/paludis/distribution.cc b/paludis/distribution.cc index 6f6c9d9f6..8587ddc92 100644 --- a/paludis/distribution.cc +++ b/paludis/distribution.cc @@ -75,8 +75,7 @@ namespace paludis n::extra_data_dir() = FSPath(strip_trailing_string(stringify(d->realpath()), ".conf")), n::fallback_environment() = k.get("fallback_environment"), n::name() = strip_trailing_string(d->basename(), ".conf"), - n::paludis_package() = k.get("paludis_package"), - n::support_old_style_virtuals() = destringify<bool>(k.get("support_old_style_virtuals")) + n::paludis_package() = k.get("paludis_package") )))); } } diff --git a/paludis/distribution.hh b/paludis/distribution.hh index 037e2351d..acdff2039 100644 --- a/paludis/distribution.hh +++ b/paludis/distribution.hh @@ -52,7 +52,6 @@ namespace paludis typedef Name<struct name_fallback_environment> fallback_environment; typedef Name<struct name_name> name; typedef Name<struct name_paludis_package> paludis_package; - typedef Name<struct name_support_old_style_virtuals> support_old_style_virtuals; } /** @@ -76,7 +75,6 @@ namespace paludis NamedValue<n::fallback_environment, std::string> fallback_environment; NamedValue<n::name, std::string> name; NamedValue<n::paludis_package, std::string> paludis_package; - NamedValue<n::support_old_style_virtuals, bool> support_old_style_virtuals; }; /** diff --git a/paludis/distributions/exherbo.conf b/paludis/distributions/exherbo.conf index 1ba46adc5..cadfbcad2 100644 --- a/paludis/distributions/exherbo.conf +++ b/paludis/distributions/exherbo.conf @@ -6,5 +6,4 @@ concept_use = Option flag default_environment = paludis fallback_environment = paludis_package = sys-apps/paludis -support_old_style_virtuals = false diff --git a/paludis/distributions/gentoo.conf b/paludis/distributions/gentoo.conf index b4d6bde20..78a65b013 100644 --- a/paludis/distributions/gentoo.conf +++ b/paludis/distributions/gentoo.conf @@ -6,5 +6,4 @@ concept_use = USE flag default_environment = paludis fallback_environment = portage paludis_package = sys-apps/paludis -support_old_style_virtuals = true 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) { |