[Python-checkins] python/dist/src/Modules main.c,1.61.6.2,1.61.6.3

[loewis@users.sourceforge.net]

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

Modified Files:
      Tag: release22-maint
	main.c 
Log Message:
Patch #695250: Suppress COPYRIGHT if site.py is not read. Fixes #672614.


Index: main.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/main.c,v
retrieving revision 1.61.6.2
retrieving revision 1.61.6.3
diff -C2 -d -r1.61.6.2 -r1.61.6.3
*** main.c	17 Mar 2002 19:42:18 -0000	1.61.6.2
--- main.c	30 Mar 2003 17:00:58 -0000	1.61.6.3
***************
*** 323,329 ****
  
  	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) {
--- 323,332 ----
  
  	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) {