| 1 |
commit: ccba5a6ff0c4a2d6896827da9fa779919e86f744 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 25 22:20:15 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 26 18:09:59 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ccba5a6f |
| 7 |
|
| 8 |
bin/glsa-check: align help menu with the man page updates |
| 9 |
|
| 10 |
* This simply aligns the help menu text with the man page |
| 11 |
* Update copyright |
| 12 |
* Bump version to 1.0.1 |
| 13 |
|
| 14 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 15 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 16 |
|
| 17 |
bin/glsa-check | 27 +++++++++++++-------------- |
| 18 |
1 file changed, 13 insertions(+), 14 deletions(-) |
| 19 |
|
| 20 |
diff --git a/bin/glsa-check b/bin/glsa-check |
| 21 |
index b5b76aae2..83ea6b7c3 100755 |
| 22 |
--- a/bin/glsa-check |
| 23 |
+++ b/bin/glsa-check |
| 24 |
@@ -1,5 +1,5 @@ |
| 25 |
#!/usr/bin/python -b |
| 26 |
-# Copyright 2008-2014 Gentoo Foundation |
| 27 |
+# Copyright 1999-2019 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
from __future__ import print_function |
| 31 |
@@ -21,51 +21,50 @@ from portage.output import green, red, nocolor, white |
| 32 |
|
| 33 |
__program__ = "glsa-check" |
| 34 |
__author__ = "Marius Mauch <genone@g.o>" |
| 35 |
-__version__ = "1.0" |
| 36 |
+__version__ = "1.0.1" |
| 37 |
|
| 38 |
# option parsing |
| 39 |
epilog = "glsa-list can contain an arbitrary number of GLSA ids," \ |
| 40 |
" filenames containing GLSAs or the special identifiers" \ |
| 41 |
" 'all', 'new' and 'affected'" |
| 42 |
-parser = argparse.ArgumentParser(usage=__program__ + " <option> [glsa-list]", |
| 43 |
+parser = argparse.ArgumentParser(usage=__program__ + " <option> [glsa-id | all | new | affected]", |
| 44 |
epilog=epilog) |
| 45 |
|
| 46 |
modes = parser.add_argument_group("Modes") |
| 47 |
modes.add_argument("-l", "--list", action="store_const", |
| 48 |
const="list", dest="mode", |
| 49 |
- help="List all unapplied GLSA") |
| 50 |
+ help="List a summary for the given GLSA(s) or set and whether they affect the system") |
| 51 |
modes.add_argument("-d", "--dump", action="store_const", |
| 52 |
const="dump", dest="mode", |
| 53 |
- help="Show all information about the given GLSA") |
| 54 |
+ help="Show all information about the GLSA(s) or set") |
| 55 |
modes.add_argument("--print", action="store_const", |
| 56 |
const="dump", dest="mode", |
| 57 |
help="Alias for --dump") |
| 58 |
modes.add_argument("-t", "--test", action="store_const", |
| 59 |
const="test", dest="mode", |
| 60 |
- help="Test if this system is affected by the given GLSA") |
| 61 |
+ help="Test if this system is affected by the GLSA(s) or set and output the GLSA ID(s)") |
| 62 |
modes.add_argument("-p", "--pretend", action="store_const", |
| 63 |
const="pretend", dest="mode", |
| 64 |
- help="Show the necessary commands to apply this GLSA") |
| 65 |
+ help="Show the necessary steps to remediate the system") |
| 66 |
modes.add_argument("-f", "--fix", action="store_const", |
| 67 |
const="fix", dest="mode", |
| 68 |
- help="Try to auto-apply this GLSA (experimental)") |
| 69 |
+ help="(experimental) Attempt to remediate the system based on the instructions given in the GLSA(s) or set. This will only upgrade (when an upgrade path exists) or remove packages") |
| 70 |
modes.add_argument("-i", "--inject", action="store_const", |
| 71 |
const="inject", dest="mode", |
| 72 |
- help="inject the given GLSA into the glsa_injected file") |
| 73 |
+ help="Inject the given GLSA(s) into the glsa_injected file") |
| 74 |
modes.add_argument("-m", "--mail", action="store_const", |
| 75 |
const="mail", dest="mode", |
| 76 |
help="Send a mail with the given GLSAs to the administrator") |
| 77 |
- |
| 78 |
parser.add_argument("-V", "--version", action="store_true", |
| 79 |
- help="Some information about this tool") |
| 80 |
+ help="Show information about glsa-check") |
| 81 |
parser.add_argument("-v", "--verbose", action="store_true", dest="verbose", |
| 82 |
- help="Print more information") |
| 83 |
+ help="Print more messages") |
| 84 |
parser.add_argument("-n", "--nocolor", action="store_true", |
| 85 |
- help="Disable colors") |
| 86 |
+ help="Removes color from output") |
| 87 |
parser.add_argument("-e", "--emergelike", action="store_false", dest="least_change", |
| 88 |
help="Do not use a least-change algorithm") |
| 89 |
parser.add_argument("-c", "--cve", action="store_true", dest="list_cve", |
| 90 |
- help="Show CAN ids in listing mode") |
| 91 |
+ help="Show CVE IDs in listing mode") |
| 92 |
|
| 93 |
options, params = parser.parse_known_args() |
Archives