diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2003-03-30 17:00:39 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2003-03-30 17:00:39 (GMT) |
| commit | e98922fb80a38fe9b6eb9612f92d9470f2cd2fa8 (patch) | |
| tree | c6a6d42ef05b3bbb920b423b628ff112fb5e38e7 /Modules | |
| parent | 24b8881f6174205c0060bdbfb77536208431ed79 (diff) | |
| download | cpython-e98922fb80a38fe9b6eb9612f92d9470f2cd2fa8.zip cpython-e98922fb80a38fe9b6eb9612f92d9470f2cd2fa8.tar.gz cpython-e98922fb80a38fe9b6eb9612f92d9470f2cd2fa8.tar.bz2 | |
Patch #695250: Suppress COPYRIGHT if site.py is not read. Fixes #672614.
Will backport to 2.2.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Modules/main.c b/Modules/main.c index 80c50b0..056a6b6 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -370,9 +370,12 @@ Py_Main(int argc, char **argv) Py_Initialize(); if (Py_VerboseFlag || - (command == NULL && filename == NULL && stdin_is_interactive)) - fprintf(stderr, "Python %s on %s\n%s\n", - Py_GetVersion(), Py_GetPlatform(), COPYRIGHT); + (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) { /* Backup _PyOS_optind and force sys.argv[0] = '-c' */ |