Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(896)

Unified Diff: recipe_engine/package.py

Issue 2837493002: Revert of [autoroller] All commits in updates(), only roll interesting ones. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « recipe_engine/fetch.py ('k') | recipe_engine/unittests/fetch_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipe_engine/package.py
diff --git a/recipe_engine/package.py b/recipe_engine/package.py
index 5e89ca9252b3481d59e424ded9c88a996d0d4f1a..bf83236925e39ecb04065456247fb48dc32eeb11 100644
--- a/recipe_engine/package.py
+++ b/recipe_engine/package.py
@@ -209,8 +209,18 @@
Returns list(CommitMetadata)
"""
- return self.backend.updates(
- self.revision, self.backend.resolve_refspec(self._branch_for_remote))
+ spec = self.spec_pb()
+
+ paths = []
+ subdir = spec.recipes_path
+ if subdir:
+ # We add package_file to the list of paths to check because it might
+ # contain other upstream rolls, which we want.
+ paths.extend([subdir + os.path.sep,
+ InfraRepoConfig().relative_recipes_cfg])
+
+ other_revision = self.backend.resolve_refspec(self._branch_for_remote)
+ return self.backend.updates(self.revision, other_revision, paths)
def _components(self):
return (self.project_id, self.repo, self.revision, self.path)
@@ -240,8 +250,7 @@
'',
0,
(),
- self.spec_pb(),
- False
+ self.spec_pb()
)
def updates(self):
« no previous file with comments | « recipe_engine/fetch.py ('k') | recipe_engine/unittests/fetch_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698