diff options
| author | Andrew M. Kuchling <amk@amk.ca> | 2001-01-16 16:33:28 +0000 |
|---|---|---|
| committer | Andrew M. Kuchling <amk@amk.ca> | 2001-01-16 16:33:28 +0000 |
| commit | 0ba9e275bcee178865538fd56cdab7fd5394fa69 (patch) | |
| tree | 437d9fe4b3c87db2a50fde4dc7c50512db2ceec0 /Lib | |
| parent | f2bbadb65842cbe0f328289b32e7d1bc5cbae765 (diff) | |
| download | cpython-0ba9e275bcee178865538fd56cdab7fd5394fa69.tar.gz | |
Fix bugs with integer-valued variables when parsing Makefiles. Values
for done[n] can be integers as well as strings, but the code
concatenates them with strings (fixed by adding a str()) and calls
string.strip() on them (fixed by rearranging the logic)
(Presumably this wasn't noticed previously because parse_makefile()
was only called on Modules/Makefile, which contains no integer-valued
variables.)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/sysconfig.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index d57b915911..4da376898c 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -204,13 +204,15 @@ def parse_makefile(fn, g=None): n = m.group(1) if done.has_key(n): after = value[m.end():] - value = value[:m.start()] + done[n] + after + value = value[:m.start()] + str(done[n]) + after if "$" in after: notdone[name] = value else: try: value = string.atoi(value) - except ValueError: pass - done[name] = string.strip(value) + except ValueError: + done[name] = string.strip(value) + else: + done[name] = value del notdone[name] elif notdone.has_key(n): # get it on a subsequent round @@ -223,8 +225,10 @@ def parse_makefile(fn, g=None): notdone[name] = value else: try: value = string.atoi(value) - except ValueError: pass - done[name] = string.strip(value) + except ValueError: + done[name] = string.strip(value) + else: + done[name] = value del notdone[name] else: # bogus variable reference; just drop it since we can't deal |