| 1 |
commit: af9574c902d4844d2d85fa954f5b1cf1ef7adda8 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 29 18:30:58 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 29 19:27:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=af9574c9 |
| 7 |
|
| 8 |
glsa-check: Hide non-vuln glsas in quiet mode |
| 9 |
|
| 10 |
This patch is a forward port of the following commit: |
| 11 |
|
| 12 |
https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=d3e4aad5a03efbd5089f96558d2ddd1e9bf158a8 |
| 13 |
|
| 14 |
commit d3e4aad5a03efbd5089f96558d2ddd1e9bf158a8 |
| 15 |
Author: vapier <vapier <AT> gentoo.org> |
| 16 |
AuthorDate: 2010-03-07 01:37:57 +0000 |
| 17 |
Commit: vapier <vapier <AT> gentoo.org> |
| 18 |
CommitDate: 2010-03-07 01:37:57 +0000 |
| 19 |
|
| 20 |
glsa-check: hide non-vuln glsas in quiet mode |
| 21 |
|
| 22 |
svn path=/trunk/gentoolkit/; revision=750 |
| 23 |
|
| 24 |
Bug: https://bugs.gentoo.org/692872 |
| 25 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 26 |
|
| 27 |
bin/glsa-check | 16 ++++++++++++---- |
| 28 |
1 file changed, 12 insertions(+), 4 deletions(-) |
| 29 |
|
| 30 |
diff --git a/bin/glsa-check b/bin/glsa-check |
| 31 |
index bfcbaa61f..f6c744d84 100755 |
| 32 |
--- a/bin/glsa-check |
| 33 |
+++ b/bin/glsa-check |
| 34 |
@@ -222,10 +222,14 @@ if mode in ["dump", "fix", "inject", "pretend"]: |
| 35 |
if mode == "dump": |
| 36 |
myglsa.dump() |
| 37 |
elif mode == "fix": |
| 38 |
- sys.stdout.write("Fixing GLSA "+myid+"\n") |
| 39 |
+ if not quiet: |
| 40 |
+ sys.stdout.write("Fixing GLSA "+myid+"\n") |
| 41 |
if not myglsa.isVulnerable(): |
| 42 |
- sys.stdout.write(">>> no vulnerable packages installed\n") |
| 43 |
+ if not quiet: |
| 44 |
+ sys.stdout.write(">>> no vulnerable packages installed\n") |
| 45 |
else: |
| 46 |
+ if quiet: |
| 47 |
+ sys.stdout.write("Fixing GLSA "+myid+"\n") |
| 48 |
mergelist = myglsa.getMergeList(least_change=least_change) |
| 49 |
if mergelist == []: |
| 50 |
sys.stdout.write(">>> cannot fix GLSA, no unaffected packages available\n") |
| 51 |
@@ -247,10 +251,14 @@ if mode in ["dump", "fix", "inject", "pretend"]: |
| 52 |
if len(mergelist): |
| 53 |
sys.stdout.write("\n") |
| 54 |
elif mode == "pretend": |
| 55 |
- sys.stdout.write("Checking GLSA "+myid+"\n") |
| 56 |
+ if not quiet: |
| 57 |
+ sys.stdout.write("Checking GLSA "+myid+"\n") |
| 58 |
if not myglsa.isVulnerable(): |
| 59 |
- sys.stdout.write(">>> no vulnerable packages installed\n") |
| 60 |
+ if not quiet: |
| 61 |
+ sys.stdout.write(">>> no vulnerable packages installed\n") |
| 62 |
else: |
| 63 |
+ if quiet: |
| 64 |
+ sys.stdout.write("Checking GLSA "+myid+"\n") |
| 65 |
mergedict = {} |
| 66 |
for (vuln, update) in myglsa.getAffectionTable(least_change=least_change): |
| 67 |
mergedict.setdefault(update, []).append(vuln) |
Archives