[Python-checkins] python/dist/src/Modules main.c,1.75,1.76

[loewis@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv4710/Modules

Modified Files:
	main.c 
Log Message:
Patch #695250: Suppress COPYRIGHT if site.py is not read. Fixes #672614.
Will backport to 2.2.


Index: main.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/main.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** main.c	5 Mar 2003 16:00:15 -0000	1.75
--- main.c	30 Mar 2003 17:00:39 -0000	1.76
***************
*** 371,377 ****
  
  	if (Py_VerboseFlag ||
! 	    (command == NULL && filename == NULL && stdin_is_interactive))
! 		fprintf(stderr, "Python %s on %s\n%s\n",
! 			Py_GetVersion(), Py_GetPlatform(), COPYRIGHT);
  
  	if (command != NULL) {
--- 371,380 ----
  
  	if (Py_VerboseFlag ||
! 	    (command == NULL && filename == NULL && stdin_is_interactive)) {
! 		fprintf(stderr, "Python %s on %s\n",
! 			Py_GetVersion(), Py_GetPlatform());
!  		if (!Py_NoSiteFlag)
!  			fprintf(stderr, "%s\n", COPYRIGHT);
! 	}
  
  	if (command != NULL) {