rules/selection: use strrchr in EVR checks as well

diff --git a/src/rules.c b/src/rules.c
index 9307394d9f6d1441fce56a4283177ffdefdbb709..b191268bec854a6bcbf4bcdbba8e03405d320609 100644 (file)
--- a/src/rules.c
+++ b/src/rules.c
@@ -1608,7 +1608,7 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q)
                {
                  if (pool->disttype != DISTTYPE_DEB)
                    {
-                     const char *rel = strchr(pool_id2str(pool, rd->evr), '-');
+                     const char *rel = strrchr(pool_id2str(pool, rd->evr), '-');
                      if (rel && pool->disttype == DISTTYPE_HAIKU && (rel[1] < '0' || rel[1] > '9'))
                        rel = 0;
                      set |= rel ? SOLVER_SETEVR : SOLVER_SETEV;

diff --git a/src/selection.c b/src/selection.c
index 2b9d434441126d5f497ecbf52f3e42b99e9e9fb2..df09b5f19595d11d7ca61c0e8a46ba2f0c24fe24 100644 (file)
--- a/src/selection.c
+++ b/src/selection.c
@@ -218,7 +218,7 @@ selection_filter_rel(Pool *pool, Queue *selection, Id relflags, Id relevr)
             selection->elements[i] |= SOLVER_SETEVR;   /* debian can't match version only like rpm */
          else
            {
-             const char *rel =  strchr(pool_id2str(pool, relevr), '-');
+             const char *rel =  strrchr(pool_id2str(pool, relevr), '-');
              if (rel && pool->disttype == DISTTYPE_HAIKU && (rel[1] < '0' || rel[1] > '9'))
                rel = 0;
              selection->elements[i] |= rel ? SOLVER_SETEVR : SOLVER_SETEV;