diff options
| author | Jan Niklas Hasse <jhasse@bixense.com> | 2023-10-14 09:06:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-14 09:06:40 (GMT) |
| commit | 885b4efb41c039789b81f0dc0d67c1ed0faea17c (patch) | |
| tree | 11203aa2c3daea03a6f3581a63b8d738326b6373 | |
| parent | 7a8c494d2d1c643a997bc6d8598f2ff75eb77dd1 (diff) | |
| parent | 0a9c9c5f50c60de4a7acfed8aaa048c74cd2f43b (diff) | |
| download | Ninja-885b4efb41c039789b81f0dc0d67c1ed0faea17c.zip Ninja-885b4efb41c039789b81f0dc0d67c1ed0faea17c.tar.gz Ninja-885b4efb41c039789b81f0dc0d67c1ed0faea17c.tar.bz2 | |
Merge pull request #2340 from bc-lee/feature/deprecate-pipes-module
Replace pipes.quote with shlex.quote in configure.py
| -rwxr-xr-x | configure.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.py b/configure.py index 588250a..939153d 100755 --- a/configure.py +++ b/configure.py @@ -21,8 +21,7 @@ or use a meta-build system that supports Ninja output.""" from optparse import OptionParser import os -import pipes -import string +import shlex import subprocess import sys @@ -262,7 +261,7 @@ n.variable('configure_args', ' '.join(configure_args)) env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) if configure_env: - config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) + config_str = ' '.join([k + '=' + shlex.quote(configure_env[k]) for k in configure_env]) n.variable('configure_env', config_str + '$ ') n.newline() |