diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-05-19 14:20:48 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-05-19 20:52:24 +0100 |
| commit | e52571861104efe6139b78b22557211f08025f11 (patch) | |
| tree | 634bec98491886d12f8f5a25b24f4cacf8d69de5 /src/clients/cave/resolve_common.cc | |
| parent | 80bf4ad14bfd8ab74a9c0d5f203ad5a370351def (diff) | |
| download | paludis-e52571861104efe6139b78b22557211f08025f11.tar.gz paludis-e52571861104efe6139b78b22557211f08025f11.tar.xz | |
Revert the package dep spec changes
Diffstat (limited to 'src/clients/cave/resolve_common.cc')
| -rw-r--r-- | src/clients/cave/resolve_common.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc index e9356af87..b095dfce5 100644 --- a/src/clients/cave/resolve_common.cc +++ b/src/clients/cave/resolve_common.cc @@ -106,7 +106,6 @@ #include <paludis/generator.hh> #include <paludis/selection.hh> #include <paludis/elike_blocker.hh> -#include <paludis/package_dep_spec_properties.hh> #include <algorithm> #include <iostream> @@ -1125,23 +1124,7 @@ paludis::cave::resolve_common( if ('!' != t->at(0) && std::string::npos != t->find('/')) { PackageDepSpec ts(parse_spec_with_nice_error(*t, env.get(), { }, filter::All())); - - if (package_dep_spec_has_properties(ts, make_named_values<PackageDepSpecProperties>( - n::has_any_slot_requirement() = indeterminate, - n::has_category_name_part() = indeterminate, - n::has_choice_requirements() = indeterminate, - n::has_exact_slot_requirement() = indeterminate, - n::has_from_repository() = indeterminate, - n::has_in_repository() = indeterminate, - n::has_installable_to_path() = indeterminate, - n::has_installable_to_repository() = indeterminate, - n::has_installed_at_path() = indeterminate, - n::has_key_requirements() = indeterminate, - n::has_package() = indeterminate, - n::has_package_name_part() = indeterminate, - n::has_tag() = indeterminate, - n::has_version_requirements() = true - ))) + if (ts.version_requirements_ptr() && ! ts.version_requirements_ptr()->empty()) { confirm_helper.add_permit_downgrade_spec(ts); confirm_helper.add_permit_old_version_spec(ts); |