aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-09-07 00:05:46 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-09-07 00:05:46 +0100
commita7f07b33a0a8ff655eec08ed1fb2f0ed288d213d (patch)
tree1f808ad352eae82327bc570d7838c03dbfc28154
parentb77919a18ccc2863da8eece251618e2587124944 (diff)
downloadpaludis-a7f07b33a0a8ff655eec08ed1fb2f0ed288d213d.tar.gz
paludis-a7f07b33a0a8ff655eec08ed1fb2f0ed288d213d.tar.xz
Stop supporting * with operators other than =.
Portage stopped supporting it at some point in the past, so hopefully everyone's fixed all their packages by now.
-rw-r--r--paludis/elike_package_dep_spec.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/paludis/elike_package_dep_spec.cc b/paludis/elike_package_dep_spec.cc
index 17e2f2b..84849fa 100644
--- a/paludis/elike_package_dep_spec.cc
+++ b/paludis/elike_package_dep_spec.cc
@@ -331,14 +331,7 @@ paludis::elike_get_remove_version_operator(std::string & s, const ELikePackageDe
if ((! s.empty()) && ('*' == s.at(s.length() - 1)))
{
if (op != vo_equal)
- {
- if (options[epdso_strict_parsing])
- throw PackageDepSpecError("Package dep spec uses * with operator '" + stringify(op) + "'");
- else
- Log::get_instance()->message("e.package_dep_spec.bad_operator", ll_qa, lc_context)
- << "Package dep spec uses * with operator '" << op << "', pretending it uses the equals operator instead";
- }
- op = vo_equal_star;
+ throw PackageDepSpecError("Package dep spec uses * with operator '" + stringify(op) + "'");
s.erase(s.length() - 1);
}