summaryrefslogtreecommitdiffstats
path: root/misc/ninja_syntax.py
diff options
context:
space:
mode:
authorEvan Jones <ej@evanjones.ca>2012-01-04 19:58:42 (GMT)
committerEvan Jones <ej@evanjones.ca>2012-01-04 22:36:08 (GMT)
commit16e4419e88925b82c1158fcfbbb78c2e30f91905 (patch)
treedec8e6fcfe6e98e1541697e32b1c8b8b486f8acf /misc/ninja_syntax.py
parentb12139c13e8924ce4d0e634f5798274a5d87f5d7 (diff)
downloadNinja-16e4419e88925b82c1158fcfbbb78c2e30f91905.zip
Ninja-16e4419e88925b82c1158fcfbbb78c2e30f91905.tar.gz
Ninja-16e4419e88925b82c1158fcfbbb78c2e30f91905.tar.bz2
ninja_syntax.py: Fix a bug when passing dict variables to Writer.build()
Add a test to cover both dict and list variables.
Diffstat (limited to 'misc/ninja_syntax.py')
-rw-r--r--misc/ninja_syntax.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/misc/ninja_syntax.py b/misc/ninja_syntax.py
index b73a002..2e487d1 100644
--- a/misc/ninja_syntax.py
+++ b/misc/ninja_syntax.py
@@ -66,7 +66,12 @@ class Writer(object):
' '.join(all_inputs)))
if variables:
- for key, val in variables:
+ if isinstance(variables, dict):
+ iterator = variables.iteritems()
+ else:
+ iterator = iter(variables)
+
+ for key, val in iterator:
self.variable(key, val, indent=1)
return outputs