File call-startup-script-always.patch of Package saltbundlepy

Overview Repositories Revisions Requests Users Attributes Meta

File call-startup-script-always.patch of Package saltbundlepy (Revision 6ba0ad65896164a116d721e9e370f4b7)

Currently displaying revision 6ba0ad65896164a116d721e9e370f4b7 , Show latest

Index: Python-3.10.10/Modules/main.c
===================================================================
--- Python-3.10.10.orig/Modules/main.c
+++ Python-3.10.10/Modules/main.c
@@ -480,10 +480,6 @@ pymain_run_stdin(PyConfig *config)
         Py_InspectFlag = 0; /* do exit on SystemExit */
 
         int exitcode;
-        if (pymain_run_startup(config, &exitcode)) {
-            return exitcode;
-        }
-
         if (pymain_run_interactive_hook(&exitcode)) {
             return exitcode;
         }
@@ -574,6 +570,10 @@ pymain_run_python(int *exitcode)
     pymain_header(config);
     pymain_import_readline(config);
 
+    if (pymain_run_startup(config, exitcode)) {
+        return;
+    }
+
     if (config->run_command) {
         *exitcode = pymain_run_command(config->run_command);
     }
Index: Python-3.10.10/Python/initconfig.c
===================================================================
--- Python-3.10.10.orig/Python/initconfig.c
+++ Python-3.10.10/Python/initconfig.c
@@ -108,7 +108,7 @@ file   : program read from script file\n
 -      : program read from stdin (default; interactive mode if a tty)\n\
 arg ...: arguments passed to program in sys.argv[1:]\n\n\
 Other environment variables:\n\
-PYTHONSTARTUP: file executed on interactive startup (no default)\n\
+PYTHONSTARTUP: file executed on Python startup\n\
 PYTHONPATH   : '%lc'-separated list of directories prefixed to the\n\
                default module search path.  The result is sys.path.\n\
 ";

Places

File call-startup-script-always.patch of Package saltbundlepy (Revision 6ba0ad65896164a116d721e9e370f4b7)

Places