aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-01-27 17:55:48 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-01-27 22:22:12 +0200
commit7375eaa26393027e68a45a8c1fdcb0ec81b2200a (patch)
tree1b0214b55980ef23d4728060926062eac1feedaa
parent8cb2cbaed28df42932d4c5399803f746c02f629c (diff)
downloadmeson-7375eaa26393027e68a45a8c1fdcb0ec81b2200a.zip
meson-7375eaa26393027e68a45a8c1fdcb0ec81b2200a.tar.gz
meson-7375eaa26393027e68a45a8c1fdcb0ec81b2200a.tar.bz2
Always disable interpolation for ini parsers.
-rwxr-xr-xghwt.py2
-rw-r--r--mesonbuild/coredata.py2
-rw-r--r--mesonbuild/wrap/wraptool.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/ghwt.py b/ghwt.py
index 970c72f..4e1c9b4 100755
--- a/ghwt.py
+++ b/ghwt.py
@@ -43,7 +43,7 @@ def unpack(sproj, branch, outdir):
subprocess.check_call(['git', 'clone', '-b', branch, 'https://github.com/mesonbuild/{}.git'.format(sproj), outdir])
usfile = os.path.join(outdir, 'upstream.wrap')
assert(os.path.isfile(usfile))
- config = configparser.ConfigParser()
+ config = configparser.ConfigParser(interpolation=None)
config.read(usfile)
us_url = config['wrap-file']['source_url']
us = urllib.request.urlopen(us_url, timeout=req_timeout).read()
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index 2b7be7b..9d5e7ce 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -228,7 +228,7 @@ class UserFeatureOption(UserComboOption):
def load_configs(filenames: T.List[str]) -> configparser.ConfigParser:
"""Load configuration files from a named subdirectory."""
- config = configparser.ConfigParser()
+ config = configparser.ConfigParser(interpolation=None)
config.read(filenames)
return config
diff --git a/mesonbuild/wrap/wraptool.py b/mesonbuild/wrap/wraptool.py
index 351669b..e01e159 100644
--- a/mesonbuild/wrap/wraptool.py
+++ b/mesonbuild/wrap/wraptool.py
@@ -105,7 +105,7 @@ def parse_patch_url(patch_url):
return arr[-3], int(arr[-2])
def get_current_version(wrapfile):
- cp = configparser.ConfigParser()
+ cp = configparser.ConfigParser(interpolation=None)
cp.read(wrapfile)
cp = cp['wrap-file']
patch_url = cp['patch_url']