From cf6b447f3b75a89892f457390adb70c5d14e5e75 Mon Sep 17 00:00:00 2001
From: genone <genone@gentoo.org>
Date: Tue, 24 Jan 2006 16:36:19 +0000
Subject: [PATCH] Use vdb information for verbose list mode (patch by solar)

svn path=/; revision=275
---
 trunk/ChangeLog                 |  3 +++
 trunk/src/glsa-check/glsa-check | 22 +++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 7676116..fd8884a 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,6 @@
+2006-01-24 Marius Mauch <genone@gentoo.org>
+	* glsa-check: Use vbd information in verbose list mode (patch by solar)
+
 2006-01-18 Paul Varner <fuzzyray@gentoo.org>
 	* revdep-rebuild: Add capability to check libtool .la files for
 	non-existant references.
diff --git a/trunk/src/glsa-check/glsa-check b/trunk/src/glsa-check/glsa-check
index a35fd9a..9758e1c 100644
--- a/trunk/src/glsa-check/glsa-check
+++ b/trunk/src/glsa-check/glsa-check
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# $Header$
+# $Header: $
 # This program is licensed under the GPL, version 2
 
 import os,string,sys
@@ -11,7 +11,7 @@ from getopt import getopt,GetoptError
 
 __program__ = "glsa-check"
 __author__ = "Marius Mauch <genone@gentoo.org>"
-__version__ = "0.6"
+__version__ = "0.6.1"
 
 optionmap = [
 ["-l", "--list", "list all unapplied GLSA"],
@@ -181,11 +181,19 @@ if mode == "list":
 		else:
 			status = "[U]"
 			color = green
-		sys.stdout.write(color(myglsa.nr) + " " + color(status) + " " + myglsa.title + " (") 
-		for pkg in myglsa.packages.keys()[:3]:
-			sys.stdout.write(" " + pkg + " ")
-		if len(myglsa.packages) > 3:
-			sys.stdout.write("... ")
+		sys.stdout.write(color(myglsa.nr) + " " + color(status) + " " + myglsa.title + " (")
+		if not verbose:
+			for pkg in myglsa.packages.keys()[:3]:
+				sys.stdout.write(" " + pkg + " ")
+			if len(myglsa.packages) > 3:
+				sys.stdout.write("... ")
+		else:
+			for pkg in myglsa.packages.keys():
+				mylist = portage.db["/"]["vartree"].dbapi.match(portage.dep_getkey(pkg))
+				if len(mylist) > 0:
+					pkg = color(" ".join(mylist))
+				sys.stdout.write(" " + pkg + " ")
+
 		sys.stdout.write(")")
 		if list_cve:
 			sys.stdout.write(" "+(",".join([r[:13] for r in myglsa.references if r[:4] == "CAN-"])))
-- 
2.26.2