| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-09 03:21:34 +0000 (Tue, 09 Feb 2010) |
| 3 |
New Revision: 15329 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/glsa-check |
| 7 |
Log: |
| 8 |
Use cpv_getkey() instead of dep_getkey() where appropriate. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/bin/glsa-check |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/bin/glsa-check 2010-02-09 03:20:45 UTC (rev 15328) |
| 14 |
+++ main/trunk/bin/glsa-check 2010-02-09 03:21:34 UTC (rev 15329) |
| 15 |
@@ -178,7 +178,7 @@ |
| 16 |
fd1.write("... ") |
| 17 |
else: |
| 18 |
for pkg in myglsa.packages: |
| 19 |
- mylist = vardb.match(portage.dep_getkey(str(pkg))) |
| 20 |
+ mylist = vardb.match(pkg) |
| 21 |
if len(mylist) > 0: |
| 22 |
pkg = color(" ".join(mylist)) |
| 23 |
fd1.write(" " + pkg + " ") |
| 24 |
@@ -228,12 +228,12 @@ |
| 25 |
sys.stdout.write("The following updates will be performed for this GLSA:\n") |
| 26 |
for pkg in mergelist: |
| 27 |
oldver = None |
| 28 |
- for x in vardb.match(portage.dep_getkey(pkg)): |
| 29 |
+ for x in vardb.match(portage.cpv_getkey(pkg)): |
| 30 |
if vardb.aux_get(x, ["SLOT"]) == portdb.aux_get(pkg, ["SLOT"]): |
| 31 |
oldver = x |
| 32 |
if oldver == None: |
| 33 |
raise ValueError("could not find old version for package %s" % pkg) |
| 34 |
- oldver = oldver[len(portage.dep_getkey(oldver))+1:] |
| 35 |
+ oldver = oldver[len(portage.cpv_getkey(oldver))+1:] |
| 36 |
sys.stdout.write(" " + pkg + " (" + oldver + ")\n") |
| 37 |
else: |
| 38 |
sys.stdout.write("Nothing to do for this GLSA\n") |
Archives