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