commit ecf53fecd6e42feeb2fad05f73240dbe6833317b
author Paweł Hajdan, Jr <phajdan.jr@chromium.org> Fri Sep 29 18:28:49 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Oct 02 06:54:53 2017 +0000
tree 97f2e5af5de8657cb14162e3389e21de2da7b481
parent 355b70412f8b725dcf6771967387cf4ba999c98b

gclient flatten: emit conditions for hooks

Bug: 661382
Change-Id: I0e74273a5e00b4f3cf1d5c22ce0944dc2fa6f31e
Reviewed-on: https://chromium-review.googlesource.com/692934
Reviewed-by: Michael Moss <mmoss@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>

gclient.py

diff --git a/gclient.py b/gclient.py
index 1654750..ea58e96 100755
--- a/gclient.py
+++ b/gclient.py
@@ -181,6 +181,10 @@
   def name(self):
     return self._name
 
+  @property
+  def condition(self):
+    return self._condition
+
   def matches(self, file_list):
     """Returns true if the pattern matches any of files in the list."""
     if not self._pattern:
@@ -2042,6 +2046,8 @@
       s.append('    "name": "%s",' % hook.name)
     if hook.pattern is not None:
       s.append('    "pattern": "%s",' % hook.pattern)
+    if hook.condition is not None:
+      s.append('    "condition": "%s",' % hook.condition)
     s.extend(
         # Hooks run in the parent directory of their dep.
         ['    "cwd": "%s",' % os.path.normpath(os.path.dirname(dep.name))] +
@@ -2069,6 +2075,8 @@
         s.append('      "name": "%s",' % hook.name)
       if hook.pattern is not None:
         s.append('      "pattern": "%s",' % hook.pattern)
+      if hook.condition is not None:
+        s.append('    "condition": "%s",' % hook.condition)
       s.extend(
           # Hooks run in the parent directory of their dep.
           ['      "cwd": "%s",' % os.path.normpath(os.path.dirname(dep.name))] +