[paludis-commits] paludis.git (master) -- 6450119 by David Leverton

[git at git.pioto.org]

Module:    paludis.git
Branch:    master
Commit:    6450119094d0c6dbc68162a815d5a5d8e500ce00
URL:       http://git.pioto.org/?p=paludis.git;a=commit;h=6450119094d0c6dbc68162a815d5a5d8e500ce00

Author:    David Leverton <levertond at googlemail.com>
Committer: David Leverton <levertond at googlemail.com>
Date:      Sun Aug  3 16:51:54 2008 +0100

----

Kill epdso_strict_star_operator.

----

 paludis/elike_package_dep_spec.cc           |   13 +++++--------
 paludis/elike_package_dep_spec.se           |    1 -
 paludis/repositories/e/eapis/exheres-0.conf |    2 +-
 paludis/repositories/fake/dep_parser.cc     |    4 ++--
 paludis/user_dep_spec.cc                    |    2 +-
 5 files changed, 9 insertions(+), 13 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);
diff --git a/paludis/elike_package_dep_spec.se b/paludis/elike_package_dep_spec.se
index e116489..ba0e4d6 100644
--- a/paludis/elike_package_dep_spec.se
+++ b/paludis/elike_package_dep_spec.se
@@ -12,7 +12,6 @@ make_enum_ELikePackageDepSpecOption()
     key epdso_allow_repository_deps      "Allow ::repo deps"
     key epdso_allow_square_bracket_deps  "Allow [use] and [opver] deps"
     key epdso_allow_tilde_greater_deps   "Allow ~> deps"
-    key epdso_strict_star_operator       "* with an operator other than = is an error"
     key epdso_strict_parsing             "Error rather than warn for violations"
 }
 
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 3b72c37..af0c1bc 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -6,7 +6,7 @@ exported_name = exheres-0
 can_be_pbin = true
 
 package_dep_spec_parse_options = allow_slot_deps allow_square_bracket_deps \
-    allow_tilde_greater_deps strict_star_operator strict_parsing \
+    allow_tilde_greater_deps strict_parsing \
     allow_slot_equal_deps allow_slot_star_deps
 dependency_spec_tree_parse_options = disallow_any_use uri_supports_arrow
 iuse_flag_parse_options = strict_parsing
diff --git a/paludis/repositories/fake/dep_parser.cc b/paludis/repositories/fake/dep_parser.cc
index 1bbff76..389b40b 100644
--- a/paludis/repositories/fake/dep_parser.cc
+++ b/paludis/repositories/fake/dep_parser.cc
@@ -62,7 +62,7 @@ namespace
     {
         PackageDepSpec p(parse_elike_package_dep_spec(s, ELikePackageDepSpecOptions() + epdso_allow_slot_deps
                     + epdso_allow_slot_star_deps + epdso_allow_slot_equal_deps + epdso_allow_repository_deps
-                    + epdso_allow_square_bracket_deps + epdso_allow_tilde_greater_deps + epdso_strict_star_operator
+                    + epdso_allow_square_bracket_deps + epdso_allow_tilde_greater_deps
                     + epdso_strict_parsing, id));
         (*h.begin())[k::add_handler()](make_shared_ptr(new TreeLeaf<T_, PackageDepSpec>(make_shared_ptr(new PackageDepSpec(p)))));
     }
@@ -77,7 +77,7 @@ namespace
                         make_shared_ptr(new PackageDepSpec(parse_elike_package_dep_spec(s.substr(1),
                                     ELikePackageDepSpecOptions() + epdso_allow_slot_deps
                                     + epdso_allow_slot_star_deps + epdso_allow_slot_equal_deps + epdso_allow_repository_deps
-                                    + epdso_allow_square_bracket_deps + epdso_allow_tilde_greater_deps + epdso_strict_star_operator
+                                    + epdso_allow_square_bracket_deps + epdso_allow_tilde_greater_deps
                                     + epdso_strict_parsing, id)))));
             (*h.begin())[k::add_handler()](make_shared_ptr(new TreeLeaf<T_, BlockDepSpec>(b)));
         }
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index 78823b2..ddde181 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -241,7 +241,7 @@ paludis::parse_user_package_dep_spec(const std::string & ss, const Environment *
             (k::remove_trailing_slot_if_exists(), std::tr1::bind(&user_remove_trailing_slot_if_exists, _1, _2))
             (k::has_version_operator(), std::tr1::bind(&elike_has_version_operator, _1, std::tr1::cref(had_bracket_version_requirements)))
             (k::get_remove_version_operator(), std::tr1::bind(&elike_get_remove_version_operator, _1,
-                    ELikePackageDepSpecOptions() + epdso_allow_tilde_greater_deps + epdso_strict_star_operator))
+                    ELikePackageDepSpecOptions() + epdso_allow_tilde_greater_deps))
             (k::get_remove_trailing_version(), std::tr1::bind(&elike_get_remove_trailing_version, _1))
             (k::add_version_requirement(), std::tr1::bind(&elike_add_version_requirement, _1, _2, _3))
             (k::add_package_requirement(), std::tr1::bind(&user_add_package_requirement, _1, _2, env, options, filter))
---