diff options
| author | genone <genone@gentoo.org> | 2006-02-16 22:01:01 +0000 |
|---|---|---|
| committer | genone <genone@gentoo.org> | 2006-02-16 22:01:01 +0000 |
| commit | 1ef1a3fd171ddd945ef8a617c9d4b942fc971f62 (patch) | |
| tree | dceefb7aa03535d3518019245e2643c92c39edb0 /trunk | |
| parent | 94ccdd2f1bcfc4bc901eed0dadf8bb56e882c6b3 (diff) | |
| download | gentoolkit-1ef1a3fd171ddd945ef8a617c9d4b942fc971f62.tar.gz | |
fix bug #123084
svn path=/; revision=279
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/ChangeLog | 4 | ||||
| -rw-r--r-- | trunk/src/glsa-check/glsa-check | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index b200f11..bcac6c2 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,3 +1,7 @@ +2006-02-16 Marius Mauch <genone@gentoo.org> + * glsa-check: Fix bug causing the wrong summary to be displayed + for --test --verbose (bug #123084) + 2006-02-06 Paul Varner <fuzzyray@gentoo.org> * revdep-rebuild: Reset PORTAGE_NICENESS, so that emerge is not niced twice. Thanks to Lukas Reck for the patch. (Bug 121482) diff --git a/trunk/src/glsa-check/glsa-check b/trunk/src/glsa-check/glsa-check index 9758e1c..6545e9c 100644 --- a/trunk/src/glsa-check/glsa-check +++ b/trunk/src/glsa-check/glsa-check @@ -11,7 +11,7 @@ from getopt import getopt,GetoptError __program__ = "glsa-check" __author__ = "Marius Mauch <genone@gentoo.org>" -__version__ = "0.6.1" +__version__ = "0.6.2" optionmap = [ ["-l", "--list", "list all unapplied GLSA"], @@ -255,15 +255,13 @@ if mode == "test": sys.stderr.write(("invalid GLSA: %s (error message was: %s)\n" % (myid, e))) continue if myglsa.isVulnerable(): - outputlist.append(myglsa.nr) - if len(outputlist) > 0: - sys.stderr.write("This system is affected by the following GLSAs:\n") - for g in outputlist: - sys.stdout.write(g) if verbose: - sys.stdout.write(" ( " + myglsa.title + " )\n") + outputlist.append(str(myglsa.nr)+" ( "+myglsa.title+" ) ") else: - sys.stdout.write("\n") + outputlist.append(str(myglsa.nr)) + if len(outputlist) > 0: + sys.stderr.write("This system is affected by the following GLSAs:\n") + sys.stdout.write("\n".join(outputlist)+"\n") else: sys.stderr.write("This system is not affected by any of the listed GLSAs\n") sys.exit(0) |