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

Unified Diff: scripts/slave/recipe_modules/archive/api.py

Issue 2112413002: Allowing zip_build to use a file name given in build_url. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Untouching blank line. 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 | scripts/slave/recipe_modules/archive/example.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/archive/api.py
diff --git a/scripts/slave/recipe_modules/archive/api.py b/scripts/slave/recipe_modules/archive/api.py
index 3a7612bf6076902cac4d52826c34fabd4c0d2dce..ba97dd1b61d8e729cfa1e5e4695ed54cde63df85 100644
--- a/scripts/slave/recipe_modules/archive/api.py
+++ b/scripts/slave/recipe_modules/archive/api.py
@@ -106,9 +106,11 @@ class ArchiveApi(recipe_api.RecipeApi):
'--staging-dir', self.m.path['cache'].join('chrome_staging'),
'--src-dir', src_dir,
]
- if build_url or 'build_archive_url' in self.m.properties:
- args.extend(['--build-url',
- build_url or self.m.properties['build_archive_url']])
+ if 'build_archive_url' in self.m.properties:
+ args.extend(['--use-build-url-name', '--build-url',
+ self.m.properties['build_archive_url']])
+ elif build_url:
+ args.extend(['--build-url', build_url])
if build_revision:
args.extend(['--build_revision', build_revision])
if cros_board:
@@ -171,7 +173,7 @@ class ArchiveApi(recipe_api.RecipeApi):
commit = update_properties.get('got_%s_revision' % primary_project)
if commit and GIT_COMMIT_HASH_RE.match(commit):
return commit
-
+
commit = update_properties.get('got_revision_git')
if commit:
return commit
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/archive/example.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698