Make recipes.py run give better messages.

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 332 matching lines @@
       return False
     return self._proto_file == other._proto_file
 
 
 class Package(object):
   """Package represents a loaded package, and contains path and dependency
   information.
 
   This is accessed by loader.py through RecipeDeps.get_package.
   """
-  def __init__(self, name, repo_spec, deps, repo_root, recipes_dir):
+  def __init__(self, name, repo_spec, deps, repo_root, relative_recipes_dir):
     self.name = name
     self.repo_spec = repo_spec
     self.deps = deps
     self.repo_root = repo_root
-    self.recipes_dir = recipes_dir
+    self.relative_recipes_dir = relative_recipes_dir
 
   def __repr__(self):
     return '<Package(name=%r,repo_spec=%r,deps=%r,recipes_dir=%r)>' % (
         self.name, self.repo_spec, self.deps, self.recipes_dir)
 
   @property
+  def recipes_dir(self):
+    return os.path.join(self.repo_root, self.relative_recipes_dir)
+
+  @property
   def recipe_dirs(self):
     return [os.path.join(self.recipes_dir, 'recipes')]
 
   @property
   def module_dirs(self):
     return [os.path.join(self.recipes_dir, 'recipe_modules')]
 
   def find_dep(self, dep_name):
     if dep_name == self.name:
       return self
 
     assert dep_name in self.deps, (
         '%s does not exist or is not declared as a dependency of %s' % (
             dep_name, self.name))
     return self.deps[dep_name]
 
   def module_path(self, module_name):
     return os.path.join(self.recipes_dir, 'recipe_modules', module_name)
 
-  def loop_over_recipe_modules():
-    for path in self.module_dirs:
-      if os.path.isdir(path):
-        for item in os.listdir(path):
-          subpath = os.path.join(path, item)
-          if _is_recipe_module_dir(subpath):
-            yield subpath
-
   def __repr__(self):
     return 'Package(%r, %r, %r, %r)' % (
         self.name, self.repo_spec, self.deps, self.recipe_dirs)
 
   def __str__(self):
     return 'Package %s, with dependencies %s' % (self.name, self.deps.keys())
 
 
 class RollCandidate(object):
   """RollCandidate represents a recipe roll candidate, i.e. updates
@@ skipping 242 matching lines @@
     self._packages[project_id] = None
 
     deps = {}
     for dep, dep_repo in sorted(package_spec.deps.items()):
       dep_repo = self._overrides.get(dep, dep_repo)
       deps[dep] = self._create_package(dep_repo)
 
     package = Package(
         project_id, repo_spec, deps,
         repo_spec.repo_root(self._context),
-        os.path.join(repo_spec.repo_root(self._context),
-                     package_spec.recipes_path))
+        package_spec.recipes_path)
 
     self._packages[project_id] = package
     return package
 
   # TODO(luqui): Remove this, so all accesses to packages are done
   # via other packages with properly scoped deps.
   def get_package(self, package_id):
     return self._packages[package_id]
 
   @property
@@ skipping 12 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