Remove 'new' target from glsa-list

Everyone should use 'affected' or 'all'
Update man page and changelog

svn path=/trunk/gentoolkit/; revision=672

diff --git a/ChangeLog b/ChangeLog
index 6ccaa4733f72de8bd338fab3e04e72054a7216db..9ee109295194194af0b04eec08da5d25bf9feed5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-18: Robert Buchholz <rbu@gentoo.org>
+       * glsa-check: Remove 'new' target from glsa-list, everyone
+        should use 'affected' or 'all'
+       * glsa-check: fix getminupgrade API doc and TypeError (Bug 281101)
+       * glsa-check: Make --pretend output in glsa-check nicer.
+        Add colors and fix linebreaks.
+
 2009-06-22: Paul Varner <fuzzyray@gentoo.org>
        * glsa-check: Fix traceback with glsa-check -f (Bug 275105)
 

diff --git a/bin/glsa-check b/bin/glsa-check
index 9f2e344c1e1eb2443cefe59c8bfd120d80697d7b..fcd4cb05fb699410d915325780139a4fdda631fc 100755 (executable)
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -24,14 +24,14 @@ __author__ = "Marius Mauch <genone@gentoo.org>"
 __version__ = open("/usr/share/gentoolkit/VERSION").read().strip()
 
 optionmap = [
-["-l", "--list", "list all unapplied GLSA"],
-["-d", "--dump", "--print", "show all information about the given GLSA"],
-["-t", "--test", "test if this system is affected by the given GLSA"],
-["-p", "--pretend", "show the necessary commands to apply this GLSA"],
-["-f", "--fix", "try to auto-apply this GLSA (experimental)"],
+["-l", "--list", "list the GLSAs"],
+["-d", "--dump", "--print", "show all information about the GLSAs"],
+["-t", "--test", "test if this system is affected by the GLSAs"],
+["-p", "--pretend", "show the necessary steps to apply the GLSAs"],
+["-f", "--fix", "try to auto-apply the GLSAs (experimental)"],
 ["-i", "--inject", "inject the given GLSA into the glsa_injected file"],
 ["-n", "--nocolor", "disable colors (option)"],
-["-e", "--emergelike", "do not use a least-change algorithm (option)"],
+["-e", "--emergelike", "upgrade to latest version (not least-change, option)"],
 ["-h", "--help", "show this help message"],
 ["-V", "--version", "some information about this tool"],
 ["-v", "--verbose", "print more information (option)"],
@@ -112,7 +112,7 @@ if len(params) <= 0 and mode in ["fix", "test", "pretend", "dump", "inject", "ma
        sys.stderr.write("(specify \"all\" as parameter)\n\n")
        mode = "HELP"
 elif len(params) <= 0 and mode == "list":
-       params.append("new")
+       params.append("affected")
        
 # show help message
 if mode == "help" or mode == "HELP":
@@ -123,7 +123,7 @@ if mode == "help" or mode == "HELP":
                        msg += "\t" + o + "\n"
        msg += "\nglsa-list can contain an arbitrary number of GLSA ids, \n"
        msg += "filenames containing GLSAs or the special identifiers \n"
-       msg += "'all', 'new' and 'affected'\n"
+       msg += "'all' and 'affected'\n"
        if mode == "help":
                sys.stdout.write(msg)
                sys.exit(0)
@@ -173,14 +173,15 @@ todolist = [e for e in completelist if e not in checklist]
 
 glsalist = []
 if "new" in params:
-       glsalist = todolist
        params.remove("new")
+       sys.stderr.write("Warning: The 'new' glsa-list target has been removed, using 'affected'.\n")
+       params.append("affected")
        
 if "all" in params:
        glsalist = completelist
        params.remove("all")
+
 if "affected" in params:
-       # replaced completelist with todolist on request of wschlich
        for x in todolist:
                try:
                        myglsa = Glsa(x, glsaconfig)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index eee5151bc60bf6a8fe4b63bf361f81822f943a1f..be159929cacf40d642168b1975b5feddfce3b388 100644 (file)
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -1,4 +1,4 @@
-.TH "glsa-check" "1" "0.6" "Marius Mauch" "gentoolkit"
+.TH "glsa-check" "1" "0.3" "Marius Mauch" "gentoolkit"
 .SH "NAME"
 .LP 
 glsa\-check \- Gentoo: Tool to locally monitor and manage GLSAs
@@ -6,7 +6,7 @@ glsa\-check \- Gentoo: Tool to locally monitor and manage GLSAs
 .LP 
 glsa\-check <\fIoption\fP> [\fIglsa\-list\fP]
 
-[\fIglsa\-list\fR] can contain an arbitrary number of GLSA ids, filenames containing GLSAs or the special identifiers 'all', 'new' and 'affected'
+[\fIglsa\-list\fR] can contain an arbitrary number of GLSA ids, filenames containing GLSAs or the special identifiers 'all' and 'affected'
 .SH "DESCRIPTION"
 .LP 
 This tool is used to locally monitor and manage Gentoo Linux Security Advisories.
@@ -21,19 +21,19 @@ Note: In order for this tool to be effective, you must regularly sync your local
 .LP 
 .TP 
 .B \-l, \-\-list
-list all unapplied GLSA
+list the a summary for all GLSAs in glsa-list and whether they affect the system
 .TP 
 .B \-d, \-\-dump, \-\-print
-show all information about the given GLSA
+show all information about the GLSAs in glsa-list
 .TP 
 .B \-t, \-\-test
-test if this system is affected by the given GLSA
+test if this system is affected by the GLSAs in glsa-list and output the GLSA IDs
 .TP 
 .B \-p, \-\-pretend
-show the necessary commands to apply this GLSA
+show the necessary steps to apply the GLSAs in glsa-list
 .TP 
 .B \-f, \-\-fix
-try to auto\-apply this GLSA (experimental)
+try to auto\-apply the GLSAs in in glsa-list using emerge. This will only upgrade packages to later version, but not remove packages when no upgrade path exists (experimental)
 .TP 
 .B \-i, \-\-inject
 inject the given GLSA into the glsa_injected file