commit: af9574c902d4844d2d85fa954f5b1cf1ef7adda8 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu Aug 29 18:30:58 2019 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Aug 29 19:27:19 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=af9574c9
glsa-check: Hide non-vuln glsas in quiet mode This patch is a forward port of the following commit: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=d3e4aad5a03efbd5089f96558d2ddd1e9bf158a8 commit d3e4aad5a03efbd5089f96558d2ddd1e9bf158a8 Author: vapier <vapier <AT> gentoo.org> AuthorDate: 2010-03-07 01:37:57 +0000 Commit: vapier <vapier <AT> gentoo.org> CommitDate: 2010-03-07 01:37:57 +0000 glsa-check: hide non-vuln glsas in quiet mode svn path=/trunk/gentoolkit/; revision=750 Bug: https://bugs.gentoo.org/692872 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> bin/glsa-check | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/bin/glsa-check b/bin/glsa-check index bfcbaa61f..f6c744d84 100755 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -222,10 +222,14 @@ if mode in ["dump", "fix", "inject", "pretend"]: if mode == "dump": myglsa.dump() elif mode == "fix": - sys.stdout.write("Fixing GLSA "+myid+"\n") + if not quiet: + sys.stdout.write("Fixing GLSA "+myid+"\n") if not myglsa.isVulnerable(): - sys.stdout.write(">>> no vulnerable packages installed\n") + if not quiet: + sys.stdout.write(">>> no vulnerable packages installed\n") else: + if quiet: + sys.stdout.write("Fixing GLSA "+myid+"\n") mergelist = myglsa.getMergeList(least_change=least_change) if mergelist == []: sys.stdout.write(">>> cannot fix GLSA, no unaffected packages available\n") @@ -247,10 +251,14 @@ if mode in ["dump", "fix", "inject", "pretend"]: if len(mergelist): sys.stdout.write("\n") elif mode == "pretend": - sys.stdout.write("Checking GLSA "+myid+"\n") + if not quiet: + sys.stdout.write("Checking GLSA "+myid+"\n") if not myglsa.isVulnerable(): - sys.stdout.write(">>> no vulnerable packages installed\n") + if not quiet: + sys.stdout.write(">>> no vulnerable packages installed\n") else: + if quiet: + sys.stdout.write("Checking GLSA "+myid+"\n") mergedict = {} for (vuln, update) in myglsa.getAffectionTable(least_change=least_change): mergedict.setdefault(update, []).append(vuln)
