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.)

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index d57b915911eed92f3502a9dd6dda8696686d84a8..4da376898c9987fe1f2a35219143366ac4dc1fe9 100644 (file)
--- 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