summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-02-09 03:21:34 +0000
committerZac Medico <zmedico@gentoo.org>2010-02-09 03:21:34 +0000
commitb5714dd2087ca90a61127db51b336f0509cb44a1 (patch)
tree6201ca39f5aafbb41f777d34eae959f6d3c51027
parent3ffd2176fea960f550ea27be750ad90d79c2c76f (diff)
downloadportage-b5714dd2087ca90a61127db51b336f0509cb44a1.tar.gz
portage-b5714dd2087ca90a61127db51b336f0509cb44a1.tar.bz2
portage-b5714dd2087ca90a61127db51b336f0509cb44a1.zip
Use cpv_getkey() instead of dep_getkey() where appropriate.
svn path=/main/trunk/; revision=15329
-rwxr-xr-xbin/glsa-check6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/glsa-check b/bin/glsa-check
index 19f451c59..4f1b74227 100755
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -178,7 +178,7 @@ def summarylist(myglsalist, fd1=sys.stdout, fd2=sys.stderr):
fd1.write("... ")
else:
for pkg in myglsa.packages:
- mylist = vardb.match(portage.dep_getkey(str(pkg)))
+ mylist = vardb.match(pkg)
if len(mylist) > 0:
pkg = color(" ".join(mylist))
fd1.write(" " + pkg + " ")
@@ -228,12 +228,12 @@ if mode in ["dump", "fix", "inject", "pretend"]:
sys.stdout.write("The following updates will be performed for this GLSA:\n")
for pkg in mergelist:
oldver = None
- for x in vardb.match(portage.dep_getkey(pkg)):
+ for x in vardb.match(portage.cpv_getkey(pkg)):
if vardb.aux_get(x, ["SLOT"]) == portdb.aux_get(pkg, ["SLOT"]):
oldver = x
if oldver == None:
raise ValueError("could not find old version for package %s" % pkg)
- oldver = oldver[len(portage.dep_getkey(oldver))+1:]
+ oldver = oldver[len(portage.cpv_getkey(oldver))+1:]
sys.stdout.write(" " + pkg + " (" + oldver + ")\n")
else:
sys.stdout.write("Nothing to do for this GLSA\n")