[recipe_engine] Fix a couple path-related bugs.

recipe_engine/package.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import ast
 import collections
 import contextlib
 import copy
 import difflib
 import functools
@@ skipping 148 matching lines @@
     """Returns the root of this repository."""
     raise NotImplementedError()
 
   def __eq__(self, other):
     raise NotImplementedError()
 
   def __ne__(self, other):
     return not (self == other)
 
   def proto_file(self, context):
-    """Returns the ProtoFile of the recipes config file in this repository. 
+    """Returns the ProtoFile of the recipes config file in this repository.
     Requires a good checkout."""
     return ProtoFile(InfraRepoConfig().to_recipes_cfg(self.repo_root(context)))
 
 
 class GitRepoSpec(RepoSpec):
   def __init__(self, project_id, repo, branch, revision, path, backend):
     self.project_id = project_id
     self.repo = repo
     self.branch = branch
     self.revision = revision
@@ skipping 129 matching lines @@
   def __str__(self):
     return 'PathRepoSpec{path="%(path)s"}' % self.__dict__
 
   def checkout(self, context):
     pass
 
   def repo_root(self, _context):
     return self.path
 
   def proto_file(self, context):
-    """Returns the ProtoFile of the recipes config file in this repository. 
+    """Returns the ProtoFile of the recipes config file in this repository.
     Requires a good checkout."""
     return ProtoFile(InfraRepoConfig().to_recipes_cfg(self.path))
 
   def __eq__(self, other):
     if not isinstance(other, type(self)):
       return False
     return self.path == other.path
 
 
 class RootRepoSpec(RepoSpec):
@@ skipping 172 matching lines @@
     buf = proto_file.read()
     assert buf.api_version == cls.API_VERSION
 
     deps = { str(dep.project_id): cls.spec_for_dep(dep)
              for dep in buf.deps }
     return cls(str(buf.project_id), str(buf.recipes_path), deps)
 
   @classmethod
   def spec_for_dep(cls, dep):
     """Returns a RepoSpec for the given dependency protobuf."""
+    url = str(dep.url)
+    if url.startswith("file://"):
+      return PathRepoSpec(url[7:])

[martiniss, 2017/02/02 23:44:56]

nit: change this to 

return PathRepoSpec(url[len("file://"):])

[iannucci, 2017/02/02 23:58:08]

Done.

 
     if dep.repo_type in (package_pb2.DepSpec.GIT, package_pb2.DepSpec.GITILES):
       if dep.repo_type == package_pb2.DepSpec.GIT:
         backend = fetch.GitBackend()
       elif dep.repo_type == package_pb2.DepSpec.GITILES:
         backend = fetch.GitilesBackend()
       return GitRepoSpec(str(dep.project_id),
-                         str(dep.url),
+                         url,
                          str(dep.branch),
                          str(dep.revision),
                          str(dep.path_override),
                          backend)
 
     assert False, 'Unexpected repo type: %s' % dep
 
   @property
   def project_id(self):
     return self._project_id
@@ skipping 145 matching lines @@
   >>> d = { 'x': 1, 'y': 2 }
   >>> sorted(_updated(d, { 'y': 3, 'z': 4 }).items())
   [('x', 1), ('y', 3), ('z', 4)]
   >>> sorted(d.items())
   [('x', 1), ('y', 2)]
   """
 
   d = copy.copy(d)
   d.update(updates)
   return d