[Docutils-checkins] sandbox/davidg/infrastructure docutils-update,1.20,1.21

[David G. <go...@us...>]

Update of /cvsroot/docutils/sandbox/davidg/infrastructure
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16753

Modified Files:
	docutils-update 
Log Message:
updated

Index: docutils-update
===================================================================
RCS file: /cvsroot/docutils/sandbox/davidg/infrastructure/docutils-update,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- docutils-update	16 Jan 2003 20:45:32 -0000	1.20
+++ docutils-update	23 Apr 2004 14:17:46 -0000	1.21
@@ -31,7 +31,7 @@
 do
     case $opt in
         e)  root="-d:ext:${USER}@cvs1:/cvsroot/docutils" ;;
-        p)  export PYTHONPATH=$pylib:$lib;;
+        p)  export PYTHONPATH=$pylib:$lib:$lib/extras;;
         t)  trace=1;;
         u)  unconditional=1;;
         \?) exit 2;;
@@ -99,10 +99,13 @@
         if [ $unconditional -eq 1 -o $txtfile -nt $htmlfile ] ; then
             if [ "${base:0:4}" == "pep-" ] ; then
                 echo "$txtfile (PEP)"
-                ~/bin/python $lib/tools/pep2html.py $txtfile
+				# pep2html.py fails on SourceForge; can't import cgi
+				# (cgi imports urllib which imports socket which imports 
+				# _socket; libssl.so.2 doesn't exist on SF):
+                ~/bin/python $lib/tools/pep.py --config=$dir/docutils.conf $txtfile $htmlfile
             else
                 echo $txtfile
-                ~/bin/python $lib/tools/html.py --config=$dir/docutils.conf $txtfile $htmlfile
+                ~/bin/python $lib/tools/rst2html.py --config=$dir/docutils.conf $txtfile $htmlfile
             fi
         fi
     fi