Revert of 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 07d44e28aa862e15951888529707ac3fe8ba0c4a..51c79eba4ce9155bb6dbc12ff1670aadfb3ed40b 100755
--- a/scripts/slave/bot_update.py
+++ b/scripts/slave/bot_update.py
@@ -1257,19 +1257,15 @@
   if patch_url:
     patches = get_svn_patch(patch_url)
 
-  already_patched = []
   for solution in solutions:
-    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('/')
+    # At first, only patch top-level DEPS.
+    if patch_root == solution['name']:
       if patches:
-        apply_svn_patch(patch_root, patches, whitelist=[target])
-        already_patched.append(target)
+        apply_svn_patch(patch_root, patches, whitelist=['DEPS'])
       elif issue:
         apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
-                            revision_mapping, git_ref, whitelist=[target])
-        already_patched.append(target)
+                            revision_mapping, git_ref, whitelist=['DEPS'])
+      break
 
   if buildspec:
     buildspecs2git(first_sln, buildspec)
@@ -1302,10 +1298,10 @@
                         dir_names, revisions)
   # Apply the rest of the patch here (sans DEPS)
   if patches:
-    apply_svn_patch(patch_root, patches, blacklist=already_patched)
+    apply_svn_patch(patch_root, patches, blacklist=['DEPS'])
   elif issue:
     apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
-                         revision_mapping, git_ref, blacklist=already_patched)
+                         revision_mapping, git_ref, blacklist=['DEPS'])
 
   # Reset the deps_file point in the solutions so that hooks get run properly.
   for sln in solutions: