Fix flattened hooks_os list formatting.

R=dpranke@chromium.org, phajdan.jr@chromium.org

Bug: 570091
Change-Id: Ic2aa1a9fe18f3fe8d5aa6fa4c4e9269106b36092
Reviewed-on: https://chromium-review.googlesource.com/553719
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Reviewed-by: Di Mu <dimu@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>

gclient.py

@@ -1944,7 +1944,7 @@ def _HooksOsToLines(hooks_os):
   """Converts |hooks| list to list of lines for output."""
   s = ['hooks_os = {']
   for hook_os, os_hooks in hooks_os.iteritems():
-    s.append('  "%s": {' % hook_os)
+    s.append('  "%s": [' % hook_os)
     for dep, hook in os_hooks:
       s.extend([
           '    # %s' % dep.hierarchy(include_url=False),
@@ -1961,7 +1961,7 @@ def _HooksOsToLines(hooks_os):
           ['          "%s",' % arg for arg in hook.action] +
           ['      ]', '    },', '']
       )
-    s.extend(['  },', ''])
+    s.extend(['  ],', ''])
   s.extend(['}', ''])
   return s
 

tests/gclient_smoketest.py

@@ -663,7 +663,7 @@ class GClientSmokeGIT(GClientSmokeBase):
         ']',
         '',
         'hooks_os = {',
-        '  "mac": {',
+        '  "mac": [',
         '    # src',
         '    {',
         '      "pattern": ".",',
@@ -676,7 +676,7 @@ class GClientSmokeGIT(GClientSmokeBase):
         '      ]',
         '    },',
         '',
-        '  },',
+        '  ],',
         '',
         '}',
         '',