From e98922fb80a38fe9b6eb9612f92d9470f2cd2fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 30 Mar 2003 17:00:39 +0000 Subject: Patch #695250: Suppress COPYRIGHT if site.py is not read. Fixes #672614. Will backport to 2.2. --- Modules/main.c | 9 ++++++--- 1 file 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' */ -- cgit v0.12