You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by co...@apache.org on 2024/08/26 13:36:56 UTC

svn commit: r1920201 - in /apr/site/trunk/release: common-lib.sh r4-stage-release.sh

Author: covener
Date: Mon Aug 26 13:36:56 2024
New Revision: 1920201

URL: http://svn.apache.org/viewvc?rev=1920201&view=rev
Log:
CHANGES consistency

Modified:
    apr/site/trunk/release/common-lib.sh
    apr/site/trunk/release/r4-stage-release.sh

Modified: apr/site/trunk/release/common-lib.sh
URL: http://svn.apache.org/viewvc/apr/site/trunk/release/common-lib.sh?rev=1920201&r1=1920200&r2=1920201&view=diff
==============================================================================
--- apr/site/trunk/release/common-lib.sh (original)
+++ apr/site/trunk/release/common-lib.sh Mon Aug 26 13:36:56 2024
@@ -432,7 +432,7 @@ EOF
 add_changes_entry() {
   ABS_CHANGES="$1"
   CVE_JSON="$2"
-  test -f "${CHANGES}" || fail "add_changes_entry: changes ${ABS_CHANGES} not found"
+  test -f "${ABS_CHANGES}" || fail "add_changes_entry: changes ${ABS_CHANGES} not found"
 
   cp "${ABS_CHANGES}" "${ABS_CHANGES}.tmp" ;
   cve_changes "${CVE_JSON}" > "${ABS_CHANGES}.entry.tmp"

Modified: apr/site/trunk/release/r4-stage-release.sh
URL: http://svn.apache.org/viewvc/apr/site/trunk/release/r4-stage-release.sh?rev=1920201&r1=1920200&r2=1920201&view=diff
==============================================================================
--- apr/site/trunk/release/r4-stage-release.sh (original)
+++ apr/site/trunk/release/r4-stage-release.sh Mon Aug 26 13:36:56 2024
@@ -120,16 +120,15 @@ perl -pi -e "s/${VERSION}, released [^<]
 echo "adding src tree changes"
 stage_checkout_release
 
-
 # checkout/update pmc and get dir dir names that have
 # been recorded there for this release
 get_version_CVE_DIRS "${DIST_DIR}/pmc"
 if test -n "${CVE_DIRS}"; then
   echo "adding CVEs: ${CVE_DIRS}"
-  for changes in CHANGES \
-    "${AO_DIST_RELEASE_PATH}/${CHANGES}-${v_major}.${v_minor}"; do
+  for changes_file in CHANGES \
+    "${AO_DIST_RELEASE_PATH}/${CHANGES}"; do
     for CVE in $CVE_DIRS; do
-      add_changes_entry "$changes" "${DIST_DIR}/pmc/SECURITY/${CVE}/CVE.json"
+      add_changes_entry "$changes_file" "${DIST_DIR}/pmc/SECURITY/${CVE}/CVE.json"
     done
   done
 fi
@@ -139,6 +138,7 @@ echo "PENDING REPOSITORY CHANGES"
 echo "--------"
 echo "SVN changes staged for ${SVN_DIST_URL}"
 svn stat "${AO_DIST_RELEASE_PATH}"
+svn diff "${AO_DIST_RELEASE_PATH}/CHANGES*"
 echo "--------"
 echo "svn changes staged in ${DIST_SITEPATH}"
 (cd "${DIST_SITEPATH}" && svn stat)