Teach bot_update to support patching deps in solutions other than the patch_root

scripts/slave/bot_update.py

Index: scripts/slave/bot_update.py
diff --git a/scripts/slave/bot_update.py b/scripts/slave/bot_update.py
index 51c79eba4ce9155bb6dbc12ff1670aadfb3ed40b..78872154ca3a47203cee98bd800dbc4c26627813 100755
--- a/scripts/slave/bot_update.py
+++ b/scripts/slave/bot_update.py
@@ -1258,14 +1258,15 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
     patches = get_svn_patch(patch_url)
 
   for solution in solutions:

[kjellander_chromium, 2014/09/08 14:14:23]

Please add a blacklist to be used when patching the rest below. Something like:

# A blacklist used to exclude the DEPS patch entries when applying the other
# parts of the patch further below.
blacklist = []

[agable, 2014/09/08 18:23:24]

Acknowledged.

-    # At first, only patch top-level DEPS.
-    if patch_root == solution['name']:
+    if (patch_root == solution['name'] or
+        solution['name'].startswith(patch_root + '/')):
+      relative_root = solution['name'][len(patch_root) + 1:]
+      target = '/'.join(relative_root, 'DEPS').lstrip('/')

[kjellander_chromium, 2014/09/08 14:14:23]

This needs to be
target = '/'.join([relative_root, 'DEPS']).lstrip('/')

[agable, 2014/09/08 18:23:24]

Done.

       if patches:

[kjellander_chromium, 2014/09/08 14:14:23]

Add
blacklist.append(target)
somewhere around here.

[agable, 2014/09/08 18:23:24]

Acknowledged.

-        apply_svn_patch(patch_root, patches, whitelist=['DEPS'])
+        apply_svn_patch(patch_root, patches, whitelist=[target])
       elif issue:
         apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
-                            revision_mapping, git_ref, whitelist=['DEPS'])
-      break
+                            revision_mapping, git_ref, whitelist=[target])
 
   if buildspec:
     buildspecs2git(first_sln, buildspec)