Ticket #590: pds-final-hyphens.patch

paludis/user_dep_spec.cc

@@ -160 +160 @@
         VersionOperator op(s.substr(0, p));
         std::string::size_type q(p);
 
+        ++q;
         while (true)
         {
             if (p >= s.length())
                 throw PackageDepSpecError("Couldn't parse dep spec '" + ss + "'");
-            q = s.find('-', q + 1);
+            q = s.find('-', q);
             if ((std::string::npos == q) || (++q >= s.length()))
                 throw PackageDepSpecError("Couldn't parse dep spec '" + ss + "'");
             if ((s.at(q) >= '0' && s.at(q) <= '9') || (0 == s.compare(q, 3, "scm")))

paludis/elike_package_dep_spec.cc

@@ -233 +233 @@
 
         std::string::size_type q(p);
 
+        ++q;
         while (true)
         {
             if (p >= s.length())
                 throw PackageDepSpecError("Couldn't parse dep spec '" + ss + "'");
-            q = s.find('-', q + 1);
+            q = s.find('-', q);
             if ((std::string::npos == q) || (++q >= s.length()))
                 throw PackageDepSpecError("Couldn't parse dep spec '" + ss + "'");
             if ((s.at(q) >= '0' && s.at(q) <= '9') || (0 == s.compare(q, 3, "scm")))

paludis/user_dep_spec_TEST.cc

@@ -147 +147 @@
             TEST_CHECK_STRINGIFY_EQUAL(next(next(m.version_requirements_ptr()->begin()))->version_spec, "1.4");
             TEST_CHECK_EQUAL(next(next(m.version_requirements_ptr()->begin()))->version_operator, vo_tilde);
             TEST_CHECK(! m.slot_requirement_ptr());
+
+            PackageDepSpec n(parse_user_package_dep_spec(">=foo/bar--1.2.3", UserPackageDepSpecOptions()));
+            TEST_CHECK_STRINGIFY_EQUAL(n, ">=foo/bar--1.2.3");
+            TEST_CHECK_STRINGIFY_EQUAL(*n.package_ptr(), "foo/bar-");
+            TEST_CHECK(! n.slot_requirement_ptr());
+            TEST_CHECK(n.version_requirements_ptr());
+            TEST_CHECK_EQUAL(std::distance(n.version_requirements_ptr()->begin(),
+                        n.version_requirements_ptr()->end()), 1);
+            TEST_CHECK_STRINGIFY_EQUAL(n.version_requirements_ptr()->begin()->version_spec, "1.2.3");
+            TEST_CHECK_EQUAL(n.version_requirements_ptr()->begin()->version_operator, vo_greater_equal);
+
         }
     } test_user_package_dep_spec;