[Python-checkins] python/dist/src/Doc/tools push-docs.sh, 1.15.18.3, 1.15.18.4

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv28884/tools

Modified Files:
      Tag: release23-maint
	push-docs.sh 
Log Message:
One more backported patch related to the removal of version numbers from
the Doc/ tree on this branch.


Index: push-docs.sh
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/push-docs.sh,v
retrieving revision 1.15.18.3
retrieving revision 1.15.18.4
diff -C2 -d -r1.15.18.3 -r1.15.18.4
*** push-docs.sh	30 Sep 2003 20:21:03 -0000	1.15.18.3
--- push-docs.sh	5 Dec 2003 18:02:23 -0000	1.15.18.4
***************
*** 11,17 ****
  ADDRESSES='python-dev at python.org doc-sig at python.org python-list at 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"
--- 11,21 ----
  ADDRESSES='python-dev at python.org doc-sig at python.org python-list at 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"
***************
*** 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 $?
--- 78,82 ----
  # 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 $?