Author: hartmannathan
Date: Fri Dec 8 06:45:00 2023
New Revision: 1914450
URL: http://svn.apache.org/viewvc?rev=1914450&view=rev
Log:
Fix "COMMITTERS file not found" with release.py roll-tarballs
* tools/dist/release.py
(roll_tarballs): When running tools/dist/make-keys.sh, pass it the path to
the COMMITTERS file, as opposed to just the directory that contains it.
* tools/dist/make-keys.sh
(): If we fail to find COMMITTERS file, print where we looked for it.
Modified:
subversion/trunk/tools/dist/make-keys.sh
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/make-keys.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/make-keys.sh?rev=1914450&r1=1914449&r2=1914450&view=diff
==============================================================================
--- subversion/trunk/tools/dist/make-keys.sh (original)
+++ subversion/trunk/tools/dist/make-keys.sh Fri Dec 8 06:45:00 2023
@@ -34,7 +34,7 @@ while getopts ":c:o:h" ARG; do
done
if [ ! -f $COMMITTERS ]; then
- echo "COMMITTERS file not found."
+ echo "COMMITTERS file not found at ${COMMITTERS}"
exit 1
fi
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1914450&r1=1914449&r2=1914450&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Fri Dec 8 06:45:00 2023
@@ -983,7 +983,7 @@ def roll_tarballs(args):
# complete wc, not a shallow wc as indicated in HACKING as one option.
# We /could/ download COMMITTERS from /trunk if it doesn't exist...
subprocess.check_call([os.path.dirname(__file__) + '/make-keys.sh',
- '-c', os.path.dirname(__file__) + '/../..',
+ '-c', os.path.dirname(__file__) +
'/../../COMMITTERS',
'-o', filepath])
shutil.move(filepath, get_target(args))
