Email Archive: webware-checkins (read-only)
|
[Webware-checkins] CVS: Webware/WebKit WebKit.cgi,1.10,1.11
From: Geoff Talvola <gtalvola@us...> - 2002-03-02 16:09
|
Update of /cvsroot/webware/Webware/WebKit
In directory usw-pr-cvs1:/tmp/cvs-serv10813/WebKit
Modified Files:
WebKit.cgi
Log Message:
Improving error messages in WebKit.cgi on failure to import CGIAdapter
Index: WebKit.cgi
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/WebKit.cgi,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** WebKit.cgi 21 Sep 2001 19:27:32 -0000 1.10
--- WebKit.cgi 2 Mar 2002 16:08:56 -0000 1.11
***************
*** 22,27 ****
sys.path.insert(1, AppWorkDir)
! import WebKit.CGIAdapter
! WebKit.CGIAdapter.main(AppWorkDir)
except:
import string, sys, traceback
--- 22,46 ----
sys.path.insert(1, AppWorkDir)
! try:
! import WebKit.CGIAdapter
! except ImportError:
! cgiAdapter = os.path.join(webKitDir, 'CGIAdapter.py')
! if not os.path.exists(cgiAdapter):
! sys.stdout.write("""\
! Content-type: text/html
!
! <html><body>
! <p>ERROR
! <p>I can't find the file %s.
! <p>If that file really doesn't exist, then you need to edit WebKit.cgi so
! that WebwareDir points to the actual Webware installation directory.
! <p>If that file does exist, then its permissions probably need to be modified
! with chmod so that WebKit.cgi can read it. You may also need to modify
! the permissions on parent directories.
! """ % cgiAdapter)
! else:
! raise
! else:
! WebKit.CGIAdapter.main(AppWorkDir)
except:
import string, sys, traceback
***************
*** 44,45 ****
--- 63,65 ----
<p><pre>%s</pre>
</body></html>\n''' % output)
+
|
Thread View
| Thread | Author | Date |
|---|---|---|
| [Webware-checkins] CVS: Webware/WebKit WebKit.cgi,1.10,1.11 | Geoff Talvola <gtalvola@us...> |