svn commit: r1909001 - in /httpd/dev-tools/release: README common-lib.sh

[co...@apache.org]

Author: covener
Date: Thu Apr  6 17:43:18 2023
New Revision: 1909001

URL: http://svn.apache.org/viewvc?rev=1909001&view=rev
Log:
allow httpd releases w/o CVE fixes

other tweaks to README

Modified:
    httpd/dev-tools/release/README
    httpd/dev-tools/release/common-lib.sh

Modified: httpd/dev-tools/release/README
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/README?rev=1909001&r1=1909000&r2=1909001&view=diff
==============================================================================
--- httpd/dev-tools/release/README (original)
+++ httpd/dev-tools/release/README Thu Apr  6 17:43:18 2023
@@ -34,9 +34,9 @@ Usage overview:
 #-----------------
    > $DEV_TOOLS/release/r5-commit-staged-release.sh
      # commit all locally staged changes to repositories and website
+   > Manual: Check that the website works. Check the download page, the vulnerabilities page.
    > $DEV_TOOLS/release/r6-announce.sh
-     # announce it to the world by mail (well, tell you how to do it)
-   # Check that the website works. Check the download page, the vulnerabilities page.
+     # announce it to the world by mail (output will tell you how to do it)
    # Process the CVEs that have been part of the release:
      - set CVEs to READY on the cveprocess site
      - Use the 'OSS/ASF Emails' tab for the emails you should send to oss-security

Modified: httpd/dev-tools/release/common-lib.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/common-lib.sh?rev=1909001&r1=1909000&r2=1909001&view=diff
==============================================================================
--- httpd/dev-tools/release/common-lib.sh (original)
+++ httpd/dev-tools/release/common-lib.sh Thu Apr  6 17:43:18 2023
@@ -521,9 +521,9 @@ get_version_CVE_DIRS() {
   checkout_pmc "${dest}"
   cve_version_dir="${dest}/SECURITY/${PROJECT}-${FULL_VERSION}"
   if ! test -d "${cve_version_dir}"; then
-    echo "CVE Directory '${cve_version_dir}' does not exist."
-    echo "It should have been created and committed during creation of the candidate."
-    fail "something is wrong with the state of ${cve_version_dir}"
+    echo "CVE Directory '${cve_version_dir}' does not exist. If you expected CVEs, ^C to interrupt"
+    sleep 30
+    return
   fi
   cves_ok=1
   CVE_DIRS=""