sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'lightmare-fix-write_config'

Browse source
This commit is contained in:
Artem Pavlenko 2020-01-30 16:31:51 +00:00
commit 3dee9b634f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils/mapnik-config/build.py
View file

@ -59,11 +59,11 @@ def write_config(env, template_filename, config_filename):
escape = env['ESCAPE'] escape = env['ESCAPE']
def subst(matchobj): def subst(matchobj):
key = matchobj.group(1) key = matchobj.group(1)
val = env.get(key) if key not in env:
if val is None:
return matchobj.group(0) return matchobj.group(0)
else: else:
return 'CONFIG_%s=%s' % (key, escape(str(val))) val = env.subst('$' + key)
return 'CONFIG_%s=%s' % (key, escape(val))
config = re.sub(r'^CONFIG_(\w+)=.*', subst, template, flags=re.M) config = re.sub(r'^CONFIG_(\w+)=.*', subst, template, flags=re.M)
config_file.write(config) config_file.write(config)
try: try: