Mercurial > cpython-lru_cache-weakref

diff Python/getopt.c @ 80504:0153c077a0fd 3.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#16306: Fix multiple error messages when unknown command line parameters where passed to the interpreter. Patch by Hieu Nguyen.
author Ezio Melotti <ezio.melotti@gmail.com>
date Sun, 18 Nov 2012 13:55:52 +0200
parents 0e8bd4785ea0
children 654a628f5f00
line wrap: on
line diff
--- a/Python/getopt.c	Sun Nov 18 13:20:36 2012 +0200
+++ b/Python/getopt.c	Sun Nov 18 13:55:52 2012 +0200
@@ -45,7 +45,7 @@
 
 void _PyOS_ResetGetOpt(void)
 {
-    _PyOS_opterr = 1;
+    _PyOS_opterr = 0;  /* prevent printing the error in 2nd loop in main.c */
     _PyOS_optind = 1;
     _PyOS_optarg = NULL;
     opt_ptr = L"";
@@ -90,18 +90,18 @@
         opt_ptr = &argv[_PyOS_optind++][1];
     }
 
-    if ( (option = *opt_ptr++) == L'\0')
+    if ((option = *opt_ptr++) == L'\0')
         return -1;
 
     if (option == 'J') {
-        fprintf(stderr, "-J is reserved for Jython\n");
+        if (_PyOS_opterr)
+            fprintf(stderr, "-J is reserved for Jython\n");
         return '_';
     }
 
     if ((ptr = wcschr(optstring, option)) == NULL) {
         if (_PyOS_opterr)
-          fprintf(stderr, "Unknown option: -%c\n", (char)option);
-
+            fprintf(stderr, "Unknown option: -%c\n", (char)option);
         return '_';
     }