Backported from trunk revision 1.16:

- change computation of VERSION to use tools/getversioninfo; this is
  more reliable than using the $Revision$ expansion
- $RELEASE is no longer needed; we can just use $VERSION now

diff --git a/Doc/tools/push-docs.sh b/Doc/tools/push-docs.sh
index 89f1870df559245cff968f80751c42d0b8888dba..5896ad90cfe27885d545620eab871accf6234592 100755 (executable)
--- a/Doc/tools/push-docs.sh
+++ b/Doc/tools/push-docs.sh
@@ -10,9 +10,12 @@ TARGET="$TARGETHOST:$TARGETDIR"
 
 ADDRESSES='python-dev@python.org doc-sig@python.org python-list@python.org'
 
-VERSION=`echo '$Revision$' | sed 's/[$]Revision: \(.*\) [$]/\1/'`
+TOOLDIR="`dirname $0`"
+VERSION=`$TOOLDIR/getversioninfo`
+
+# Set $EXTRA to something non-empty if this is a non-trunk version:
 EXTRA=`echo "$VERSION" | sed 's/^[0-9][0-9]*\.[0-9][0-9]*//'`
-if [ "$EXTRA" ] ; then
+if echo "$EXTRA" | grep -q '[.]' ; then
     DOCLABEL="maintenance"
     DOCTYPE="maint"
 else
@@ -73,8 +76,7 @@ cd ..
 
 # now in .../Doc/
 make --no-print-directory bziphtml || exit $?
-RELEASE=`grep '^RELEASE=' Makefile | sed 's|RELEASE=||'`
-PACKAGE="html-$RELEASE.tar.bz2"
+PACKAGE="html-$VERSION.tar.bz2"
 scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $?
 ssh "$TARGETHOST" tmp/update-docs.sh $DOCTYPE $PACKAGE '&&' rm tmp/update-docs.sh || exit $?