[openssl-commits] [web] master update

[Mark J. Cox]

The branch master has been updated
       via  0f05d39036d44d3ef2540dffafc32494320c0af4 (commit)
      from  8e91dc9cffe8bd60e52b5eacffe5a24341533a72 (commit)


- Log -----------------------------------------------------------------
commit 0f05d39036d44d3ef2540dffafc32494320c0af4
Author: Mark J. Cox <mark at awe.com>
Date:   Tue Jan 30 10:26:53 2018 +0000

    Put the link to the per-version pages on the main page now it all works

-----------------------------------------------------------------------

Summary of changes:
 bin/mk-cvepage | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/bin/mk-cvepage b/bin/mk-cvepage
index 70e18cc..3dcceba 100755
--- a/bin/mk-cvepage
+++ b/bin/mk-cvepage
@@ -130,17 +130,15 @@ for issue in sorted(issues, key=lambda x: (x.getAttribute('public'), x.getElemen
     allissues += "</ul></dd>"
 
 preface = "<!-- do not edit this file it is autogenerated, edit vulnerabilities.xml -->"
+bases = []
+for base in allyourbase(dom):
+    if (options.base and base in options.base):
+        bases.append("%s" %(base))
+    else:
+        bases.append( "<a href=\"vulnerabilities-%s.html\">%s</a>" %(base,base))
+preface += "Show issues fixed only in OpenSSL " + ", ".join(bases)
 if options.base:
-    # for now don't put the link to the per-base page on main page until it's ready to go live
-    bases = []
-    for base in allyourbase(dom):
-        if (options.base and base in options.base):
-            bases.append("%s" %(base))
-        else:
-            bases.append( "<a href=\"vulnerabilities-%s.html\">%s</a>" %(base,base))
-    preface += "Show issues fixed only in OpenSSL " + ", ".join(bases)
-    if (options.base):
-        preface += ", or <a href=\"vulnerabilities.html\">all versions</a>"
+    preface += ", or <a href=\"vulnerabilities.html\">all versions</a>"
     preface += "<h2>Fixed in OpenSSL %s</h2>" %(options.base)
 if len(allyears)>1: # If only vulns in this year no need for the year table of contents
     preface += "<p><a name=\"toc\">Jump to year: </a>" + ", ".join( "<a href=\"#y%s\">%s</a>" %(year,year) for year in allyears)