diff options
| author | genone <genone@gentoo.org> | 2004-12-09 17:37:16 +0000 |
|---|---|---|
| committer | genone <genone@gentoo.org> | 2004-12-09 17:37:16 +0000 |
| commit | 03ac778521ecfe039add79fab9321a6c0564cc4b (patch) | |
| tree | 22b8a6650ca34b1c041b50658f44108c583f5904 | |
| parent | c5f9b36c30757dec3267ba9527819dbab172088a (diff) | |
| download | gentoolkit-03ac778521ecfe039add79fab9321a6c0564cc4b.tar.gz | |
someone broke^Wfixed the ~ operator, so revisionMatch didn't work correctly
svn path=/; revision=181
| -rw-r--r-- | trunk/ChangeLog | 3 | ||||
| -rw-r--r-- | trunk/src/glsa-check/glsa.py | 4 |
2 files changed, 5 insertions, 2 deletions
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 <genone@gentoo.org> + * glsa.py: Another stupid bug, this time revisionMatch() broke as ~foobar-rN isn't valid anymore + 2004-12-08 Marius Mauch <genone@gentoo.org> * 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 |