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

Unified Diff: gclient.py

Issue 11236013: Add gerrit Change-Id to commit messages if they do not have one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Allow DEPS files to specify target_os Created 8 years, 2 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 | « no previous file | tests/gclient_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient.py
diff --git a/gclient.py b/gclient.py
index ab52cc8eee6098eed83c4ce41dd652606ebf4bea..c78ae87bc39c504f541e09696fb389b3f04676db 100644
--- a/gclient.py
+++ b/gclient.py
@@ -455,6 +455,11 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
self.recursion_override = local_scope.get('recursion')
logging.warning(
'Setting %s recursion to %d.', self.name, self.recursion_limit)
+ # Check if 'target_os' is present in the DEPS file. If yes, then add OSes
+ # specified to the set of enforced OSes.
+ if 'target_os' in local_scope:
+ self.root._enforced_os = tuple(
+ set(local_scope['target_os']).union(self.root._enforced_os))
# load os specific dependencies if defined. these dependencies may
# override or extend the values defined by the 'deps' member.
if 'deps_os' in local_scope:
« no previous file with comments | « no previous file | tests/gclient_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698