Roll recipe dependencies (trivial).

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/81de92519dd374d9b193362034fae8861476bc5f [autoroll] make autoroller propagate changes to recipes.py. (iannucci@chromium.org)
  https://crrev.com/0ee0446195595e5df02fc2dc82e4988b601b113e Carefully clean more unused recipe expectation directories in new 'test' command (phajdan.jr@chromium.org)
  https://crrev.com/803d6ead998b4bbca601fb3a984e76ddc063806d Fix autoroll command. (iannucci@chromium.org)

TBR=iannucci@chromium.org

Change-Id: I82dd353affefd2fef61af3ed0c6ceb2d74d601a8
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Reviewed-on: https://chromium-review.googlesource.com/456386
Reviewed-by: <recipe-roller@chromium.org>
Commit-Queue: <recipe-roller@chromium.org>

infra/config/recipes.cfg

@@ -4,5 +4,5 @@ deps {
   project_id: "recipe_engine"
   url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
   branch: "master"
-  revision: "aa0a2d61cd31decf9a5c048b677ba38eb209a1c6"
+  revision: "803d6ead998b4bbca601fb3a984e76ddc063806d"
 }

recipes.py

@@ -17,6 +17,11 @@ PER-REPO CONFIGURATION section to look like this one.
 
 import os
 
+# IMPORTANT: Do not alter the header or footer line for the
+# "PER-REPO CONFIGURATION" section below, or the autoroller will not be able
+# to automatically update this file! All lines between the header and footer
+# lines will be retained verbatim by the autoroller.
+
 #### PER-REPO CONFIGURATION (editable) ####
 # The root of the repository relative to the directory of this file.
 REPO_ROOT = ''
@@ -36,6 +41,7 @@ import subprocess
 import sys
 import time
 import traceback
+import urlparse
 
 from cStringIO import StringIO
 
@@ -72,7 +78,7 @@ def parse(repo_root, recipes_cfg_path):
       raise ValueError('could not find recipe_engine dep in %r'
                        % recipes_cfg_path)
     engine_url = engine['url']
-    engine_revision = engine['revision']
+    engine_revision = engine.get('revision', '')
     engine_subpath = engine.get('path_override', '')
     recipes_path = pb.get('recipes_path', '')
   else:
@@ -92,7 +98,7 @@ def parse(repo_root, recipes_cfg_path):
         b for b in protobuf.get('deps', [])
         if b.get('project_id') == ['recipe_engine'] ])
     engine_url = get_unique(engine_buf['url'])
-    engine_revision = get_unique(engine_buf['revision'])
+    engine_revision = get_unique(engine_buf.get('revision', ['']))
     engine_subpath = (get_unique(engine_buf.get('path_override', ['']))
                       .replace('/', os.path.sep))
     recipes_path = get_unique(protobuf.get('recipes_path', ['']))
@@ -202,9 +208,12 @@ def main():
   engine_url, engine_revision, engine_subpath, recipes_path = parse(
     repo_root, recipes_cfg_path)
 
-  deps_path = os.path.join(recipes_path, '.recipe_deps')
   engine_path = find_engine_override(sys.argv[1:])
+  if not engine_path and engine_url.startswith('file://'):
+    engine_path = urlparse.urlparse(engine_url).path
+
   if not engine_path:
+    deps_path = os.path.join(recipes_path, '.recipe_deps')
     # Ensure that we have the recipe engine cloned.
     engine_root_path = os.path.join(deps_path, 'recipe_engine')
     engine_path = os.path.join(engine_root_path, engine_subpath)