From: genone Date: Thu, 9 Dec 2004 17:37:16 +0000 (-0000) Subject: someone broke^Wfixed the ~ operator, so revisionMatch didn't work correctly X-Git-Tag: gentoolkit-0.2.4.3~325 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03ac778521ecfe039add79fab9321a6c0564cc4b;p=gentoolkit.git someone broke^Wfixed the ~ operator, so revisionMatch didn't work correctly svn path=/; revision=181 --- diff --git a/trunk/ChangeLog b/trunk/ChangeLog index 6b9dc6d..eb59a92 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,3 +1,6 @@ +2004-12-09 Marius Mauch + * glsa.py: Another stupid bug, this time revisionMatch() broke as ~foobar-rN isn't valid anymore + 2004-12-08 Marius Mauch * equery: implemented the --category option * glsa-check: fixed the bug where it wanted to unnecessary merge masked packages diff --git a/trunk/src/glsa-check/glsa.py b/trunk/src/glsa-check/glsa.py index 6759d50..3928cbf 100644 --- a/trunk/src/glsa-check/glsa.py +++ b/trunk/src/glsa-check/glsa.py @@ -315,12 +315,12 @@ def revisionMatch(revisionAtom, portdb): @rtype: list of strings @return: a list with the matching versions """ - mylist = portdb.match(revisionAtom[2:]) + mylist = portdb.match(re.sub("-r[0-9]+$", "", revisionAtom[2:])) rValue = [] for v in mylist: r1 = "\""+portage.pkgsplit(v)[-1]+"\"" r2 = "\""+portage.pkgsplit(revisionAtom[3:])[-1]+"\"" - if eval(r1+" "+revisionAtom[0:1]+" "+r2): + if eval(r1+" "+revisionAtom[0:2]+" "+r2): rValue.append(v) return rValue