|
Lines 237-243
Link Here
|
| 237 |
fd1.write("... ") |
237 |
fd1.write("... ") |
| 238 |
else: |
238 |
else: |
| 239 |
for pkg in myglsa.packages.keys(): |
239 |
for pkg in myglsa.packages.keys(): |
| 240 |
mylist = vardb.match(portage.cpv_getkey(str(pkg))) |
240 |
mylist = vardb.match(portage.dep_getkey(str(pkg))) |
| 241 |
if len(mylist) > 0: |
241 |
if len(mylist) > 0: |
| 242 |
pkg = color(" ".join(mylist)) |
242 |
pkg = color(" ".join(mylist)) |
| 243 |
fd1.write(" " + pkg + " ") |
243 |
fd1.write(" " + pkg + " ") |
|
Lines 289-300
Link Here
|
| 289 |
sys.stdout.write("The following updates will be performed for this GLSA:\n") |
289 |
sys.stdout.write("The following updates will be performed for this GLSA:\n") |
| 290 |
for pkg in mergelist: |
290 |
for pkg in mergelist: |
| 291 |
oldver = None |
291 |
oldver = None |
| 292 |
for x in vardb.match(portage.cpv_getkey(pkg)): |
292 |
for x in vardb.match(portage.dep_getkey(pkg)): |
| 293 |
if vardb.aux_get(x, ["SLOT"]) == portdb.aux_get(pkg, ["SLOT"]): |
293 |
if vardb.aux_get(x, ["SLOT"]) == portdb.aux_get(pkg, ["SLOT"]): |
| 294 |
oldver = x |
294 |
oldver = x |
| 295 |
if oldver == None: |
295 |
if oldver == None: |
| 296 |
raise ValueError("could not find old version for package %s" % pkg) |
296 |
raise ValueError("could not find old version for package %s" % pkg) |
| 297 |
oldver = oldver[len(portage.cpv_getkey(oldver))+1:] |
297 |
oldver = oldver[len(portage.dep_getkey(oldver))+1:] |
| 298 |
sys.stdout.write(" " + pkg + " (" + oldver + ")\n") |
298 |
sys.stdout.write(" " + pkg + " (" + oldver + ")\n") |
| 299 |
else: |
299 |
else: |
| 300 |
sys.stdout.write("Nothing to do for this GLSA\n") |
300 |
sys.stdout.write("Nothing to do for this GLSA\n") |
