aboutsummaryrefslogtreecommitdiff
path: root/paludis/partially_made_package_dep_spec.cc
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2015-11-08 22:31:38 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2015-11-08 22:31:38 +0000
commit27173447c84657a9aafe57b1b9bfb5c7087b0f39 (patch)
tree76042c6fec34ce2bfc94086a513340d42ed7ce4a /paludis/partially_made_package_dep_spec.cc
parent53e89a76f67868ec520ac0b6da4ce1301376ae04 (diff)
downloadpaludis-27173447c84657a9aafe57b1b9bfb5c7087b0f39.tar.gz
paludis-27173447c84657a9aafe57b1b9bfb5c7087b0f39.tar.xz
Unify =* behaviour
Gentoo changed =* to mean almost the same thing as it does in Exherbo in bug 560466; the difference being that float-like components aren't treated specially, for example 1.0123 doesn't match a dep saying =1.012*. Since nothing in Exherbo relies on this anyway, just make it the same everywhere.
Diffstat (limited to 'paludis/partially_made_package_dep_spec.cc')
-rw-r--r--paludis/partially_made_package_dep_spec.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/paludis/partially_made_package_dep_spec.cc b/paludis/partially_made_package_dep_spec.cc
index 6caf31704..e3fca243d 100644
--- a/paludis/partially_made_package_dep_spec.cc
+++ b/paludis/partially_made_package_dep_spec.cc
@@ -123,7 +123,7 @@ namespace
else if (next(version_requirements_ptr()->begin()) == version_requirements_ptr()->end() &&
! options_for_partially_made_package_dep_spec_v[pmpdso_always_use_ranged_deps])
{
- if (version_requirements_ptr()->begin()->version_operator() == vo_stupid_equal_star || version_requirements_ptr()->begin()->version_operator() == vo_nice_equal_star)
+ if (version_requirements_ptr()->begin()->version_operator() == vo_equal_star)
s << "=";
else
s << version_requirements_ptr()->begin()->version_operator();
@@ -156,7 +156,7 @@ namespace
! options_for_partially_made_package_dep_spec_v[pmpdso_always_use_ranged_deps])
{
s << "-" << version_requirements_ptr()->begin()->version_spec();
- if (version_requirements_ptr()->begin()->version_operator() == vo_stupid_equal_star || version_requirements_ptr()->begin()->version_operator() == vo_nice_equal_star)
+ if (version_requirements_ptr()->begin()->version_operator() == vo_equal_star)
s << "*";
}
}
@@ -253,14 +253,14 @@ namespace
} while (false);
}
- if (r->version_operator() == vo_stupid_equal_star || r->version_operator() == vo_nice_equal_star)
+ if (r->version_operator() == vo_equal_star)
s << "=";
else
s << r->version_operator();
s << r->version_spec();
- if (r->version_operator() == vo_stupid_equal_star || r->version_operator() == vo_nice_equal_star)
+ if (r->version_operator() == vo_equal_star)
s << "*";
need_op = true;