aboutsummaryrefslogtreecommitdiff
path: root/paludis/elike_package_dep_spec.cc
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-03 16:51:54 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-03 18:32:16 +0100
commit6450119094d0c6dbc68162a815d5a5d8e500ce00 (patch)
tree19ead2b42c8d4654dd9588b2ad9e935603ddf172 /paludis/elike_package_dep_spec.cc
parentaf9e861a4f454ac4ed37feab8d1237047c2dc3ac (diff)
downloadpaludis-6450119094d0c6dbc68162a815d5a5d8e500ce00.tar.gz
paludis-6450119094d0c6dbc68162a815d5a5d8e500ce00.tar.xz
Kill epdso_strict_star_operator.
Diffstat (limited to 'paludis/elike_package_dep_spec.cc')
-rw-r--r--paludis/elike_package_dep_spec.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/paludis/elike_package_dep_spec.cc b/paludis/elike_package_dep_spec.cc
index 49c8d07..e668b28 100644
--- a/paludis/elike_package_dep_spec.cc
+++ b/paludis/elike_package_dep_spec.cc
@@ -303,14 +303,11 @@ paludis::elike_get_remove_version_operator(std::string & s, const ELikePackageDe
{
if (op != vo_equal)
{
- if (! options[epdso_strict_star_operator])
- {
- 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";
- }
+ 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;
s.erase(s.length() - 1);