eliminate distepoch from EVR used in version comparision

1 files changed, 8 insertions, 1 deletions

diff --git a/URPM.xs b/URPM.xs
index 869a68d..6a4039a 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -269,7 +269,7 @@ ranges_overlap(uint32_t aflags, char *sa, uint32_t bflags, char *sb, int b_nopro
     int sense = 0;
     char *eosa = strchr(sa, ']');
     char *eosb = strchr(sb, ']');
-    char *ea, *va, *ra, *eb, *vb, *rb;
+    char *ea, *va, *ra, *da, *eb, *vb, *rb, *db;
 
     if (eosa) *eosa = 0;
     if (eosb) *eosb = 0;
@@ -283,6 +283,9 @@ ranges_overlap(uint32_t aflags, char *sa, uint32_t bflags, char *sb, int b_nopro
       ea = NULL;
     }
     if ((ra = strrchr(sa, '-'))) *ra++ = 0;
+    if (ra && (da = strchr(ra, ':'))) *da++ = 0;
+    else da = NULL;
+
     /* parse sb as an [epoch:]version[-release] */
     for (eb = sb; *sb >= '0' && *sb <= '9'; ++sb);
     if (*sb == ':') {
@@ -293,6 +296,8 @@ ranges_overlap(uint32_t aflags, char *sa, uint32_t bflags, char *sb, int b_nopro
       eb = NULL;
     }
     if ((rb = strrchr(sb, '-'))) *rb++ = 0;
+    if (rb && (db = strchr(rb, ':'))) *db++ = 0;
+    else db = NULL;
     /* now compare epoch */
     if (ea && eb)
       sense = rpmvercmp(*ea ? ea : "0", *eb ? eb : "0");
@@ -307,6 +312,8 @@ ranges_overlap(uint32_t aflags, char *sa, uint32_t bflags, char *sb, int b_nopro
 	sense = rpmvercmp(ra, rb);
     }
     /* restore all character that have been modified inline */
+    if (db) db[-1] = ':';
+    if (da) da[-1] = ':';
     if (rb) rb[-1] = '-';
     if (ra) ra[-1] = '-';
     if (eb) vb[-1] = ':';