Update of /cvsroot/webware/Webware/WebKit/Adapters
In directory usw-pr-cvs1:/tmp/cvs-serv12919
Modified Files:
WebKit.cgi
Log Message:
Fixed path typos in WebKit.cgi (from reorganization)
Insert WebwareDir into path even if it wasn't specified.
Index: WebKit.cgi
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Adapters/WebKit.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WebKit.cgi 9 Oct 2002 05:24:04 -0000 1.1
--- WebKit.cgi 9 Oct 2002 05:32:28 -0000 1.2
***************
*** 12,19 ****
try:
import os, sys
! if WebwareDir:
! sys.path.insert(1, WebwareDir)
! else:
WebwareDir = os.path.dirname(os.path.dirname(os.getcwd()))
webKitDir = os.path.join(WebwareDir, 'WebKit')
if AppWorkDir is None:
--- 12,18 ----
try:
import os, sys
! if not WebwareDir:
WebwareDir = os.path.dirname(os.path.dirname(os.getcwd()))
+ sys.path.insert(1, WebwareDir)
webKitDir = os.path.join(WebwareDir, 'WebKit')
if AppWorkDir is None:
***************
*** 25,29 ****
import WebKit.Adapters.CGIAdapter
except ImportError:
! cgiAdapter = os.path.join(webKitDir, 'CGIAdapter.py')
if not os.path.exists(cgiAdapter):
sys.stdout.write("""\
--- 24,28 ----
import WebKit.Adapters.CGIAdapter
except ImportError:
! cgiAdapter = os.path.join(webKitDir, 'Adapters/CGIAdapter.py')
if not os.path.exists(cgiAdapter):
sys.stdout.write("""\
***************
*** 42,46 ****
raise
else:
! WebKit.CGIAdapter.main(AppWorkDir)
except:
import string, sys, traceback
--- 41,45 ----
raise
else:
! WebKit.Adapters.CGIAdapter.main(AppWorkDir)
except:
import string, sys, traceback
|