Update of /cvsroot/python/python/dist/src/Doc/tools In directory sc8-pr-cvs1:/tmp/cvs-serv19406 Modified Files: Tag: release23-maint push-docs.sh Log Message: Revert the last change to this script on the 2.3.x maint branch; the rest of the patches needed for that to work are giong to be saved for post-2.3.2 to avoid introducing new risks in the documentation build process. Index: push-docs.sh =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tools/push-docs.sh,v retrieving revision 1.15.18.2 retrieving revision 1.15.18.3 diff -C2 -d -r1.15.18.2 -r1.15.18.3 *** push-docs.sh 28 Sep 2003 22:24:06 -0000 1.15.18.2 --- push-docs.sh 30 Sep 2003 20:21:03 -0000 1.15.18.3 *************** *** 11,20 **** ADDRESSES='python-dev@python.org doc-sig@python.org python-list@python.org' ! 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 echo "$EXTRA" | grep -q '[.]' ; then DOCLABEL="maintenance" DOCTYPE="maint" --- 11,17 ---- ADDRESSES='python-dev@python.org doc-sig@python.org python-list@python.org' ! VERSION=`echo '$Revision$' | sed 's/[$]Revision: \(.*\) [$]/\1/'` EXTRA=`echo "$VERSION" | sed 's/^[0-9][0-9]*\.[0-9][0-9]*//'` ! if [ "$EXTRA" ] ; then DOCLABEL="maintenance" DOCTYPE="maint" *************** *** 77,81 **** # now in .../Doc/ make --no-print-directory bziphtml || exit $? ! 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 $? --- 74,79 ---- # now in .../Doc/ make --no-print-directory bziphtml || exit $? ! RELEASE=`grep '^RELEASE=' Makefile | sed 's|RELEASE=||'` ! PACKAGE="html-$RELEASE.tar.bz2" scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $? ssh "$TARGETHOST" tmp/update-docs.sh $DOCTYPE $PACKAGE '&&' rm tmp/update-docs.sh || exit $?