svn commit: r1937030 - apr/site/trunk/release

Author: covener
Date: Mon Aug 10 11:35:15 2026
New Revision: 1937030

Log:
handle release with no CVE fixes

seems unimaginable today, but it happens.

Modified:
   apr/site/trunk/release/common-lib.sh
   apr/site/trunk/release/r0-make-candidate.sh

Modified: apr/site/trunk/release/common-lib.sh
==============================================================================
--- apr/site/trunk/release/common-lib.sh	Mon Aug 10 11:22:49 2026	(r1937029)
+++ apr/site/trunk/release/common-lib.sh	Mon Aug 10 11:35:15 2026	(r1937030)
@@ -543,9 +543,12 @@ 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 "No CVE directory '${cve_version_dir}' — no CVEs recorded for this release."
+    if ! ask_yes_no "Confirm: this release intentionally contains no CVE fixes?"; then
+      fail "Aborted. If CVEs are expected, ensure r0 was run correctly and the pmc checkout is up to date."
+    fi
+    CVE_DIRS=""
+    return 0
   fi
   cves_ok=1
   CVE_DIRS=""

Modified: apr/site/trunk/release/r0-make-candidate.sh
==============================================================================
--- apr/site/trunk/release/r0-make-candidate.sh	Mon Aug 10 11:22:49 2026	(r1937029)
+++ apr/site/trunk/release/r0-make-candidate.sh	Mon Aug 10 11:35:15 2026	(r1937030)
@@ -60,6 +60,18 @@ detect_checkout
 assure_clean_checkout
 detect_version $1
 
+# If dist/VERSION exists but is from a different release, discard it now
+# so later stage scripts cannot accidentally source stale state.
+if test -f "${DIST_DIR}/VERSION"; then
+  prior_full_version=$(. "${DIST_DIR}/VERSION" 2>/dev/null && \
+    v="${v_major}.${v_minor}.${v_patch}"; \
+    test -n "${v_suffix}" && echo "${v}-${v_suffix}" || echo "${v}")
+  if test "${prior_full_version}" != "${FULL_VERSION}"; then
+    echo "Discarding stale dist/VERSION (was for ${prior_full_version:-unknown}, now ${FULL_VERSION})"
+    rm -f "${DIST_DIR}/VERSION"
+  fi
+fi
+
 SVN_DEST="tags/${FULL_VERSION}-candidate"
 DEST_DIR="${DIST_DIR}/${PROJECT}-${FULL_VERSION}-candidate"