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

Unified Diff: scripts/slave/recipe_modules/sync_submodules/resources/deps2submodules.py

Issue 2185333002: Exclude nested submodules properly. This never worked. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/sync_submodules/resources/deps2submodules.py
diff --git a/scripts/slave/recipe_modules/sync_submodules/resources/deps2submodules.py b/scripts/slave/recipe_modules/sync_submodules/resources/deps2submodules.py
index 7596609ca687bffb82ee3c78743d82aa56d0c70d..23423e252c096f283f4f04274dc6e63f708a1a3b 100644
--- a/scripts/slave/recipe_modules/sync_submodules/resources/deps2submodules.py
+++ b/scripts/slave/recipe_modules/sync_submodules/resources/deps2submodules.py
@@ -36,14 +36,14 @@ def SanitizeDeps(submods, path_prefix):
parts = name.split('/')[:-1]
while parts:
- may_conflict = '/'.join(parts)
+ may_conflict = path_prefix + '/'.join(parts)
if may_conflict in submods:
logging.warning('Dropping submodule "%s", because it is nested in '
'submodule "%s"', name, may_conflict)
break
parts.pop()
-
- ret[name] = value
+ else:
+ ret[name] = value
return ret
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698