https://github.com/python/cpython/commit/de2a73dc4649b110351fce789de0abb14c460b97
commit: de2a73dc4649b110351fce789de0abb14c460b97
branch: main
author: Kien Dang <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-02-26T22:04:44+02:00
summary:
bpo-45101: Add consistency in usage message IO between 2 versions of
python-config (GH-28162)
On --help output to stdout.
On error output to stderr.
files:
A Misc/NEWS.d/next/Tools-Demos/2021-09-05-02-47-48.bpo-45101.60Zqmt.rst
M Misc/python-config.in
M Misc/python-config.sh.in
diff --git
a/Misc/NEWS.d/next/Tools-Demos/2021-09-05-02-47-48.bpo-45101.60Zqmt.rst
b/Misc/NEWS.d/next/Tools-Demos/2021-09-05-02-47-48.bpo-45101.60Zqmt.rst
new file mode 100644
index 00000000000000..48a09da7822915
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2021-09-05-02-47-48.bpo-45101.60Zqmt.rst
@@ -0,0 +1 @@
+Add consistency in usage message IO between 2 versions of python-config.
diff --git a/Misc/python-config.in b/Misc/python-config.in
index 81c3316e334a48..dd5d161ab2286f 100644
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -13,7 +13,8 @@ valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs',
'cflags',
def exit_with_usage(code=1):
print("Usage: {0} [{1}]".format(
- sys.argv[0], '|'.join('--'+opt for opt in valid_opts)),
file=sys.stderr)
+ sys.argv[0], '|'.join('--'+opt for opt in valid_opts)),
+ file=sys.stdout if code == 0 else sys.stderr)
sys.exit(code)
try:
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
index 2602fe24c0402e..eb02223ddcd2c3 100644
--- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in
@@ -4,7 +4,12 @@
exit_with_usage ()
{
- echo "Usage: $0
--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir|--embed"
+ local USAGE="Usage: $0
--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir|--embed"
+ if [[ "$1" -eq 0 ]]; then
+ echo "$USAGE"
+ else
+ echo "$USAGE" >&2
+ fi
exit $1
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
