gs_fetch_binpkg: drop double retry logic
The core gs logic takes care of retrying when it makes sense, so let's
rely on that rather than adding our own dumb logic on top of it. This
lets us detect & fail fast when hitting unrecoverable errors (like 403).
BUG=chromium:399920
TEST=set up some bad binhosts and watched emerge fail fast
TEST=build for link incrementally
Change-Id: I7860279118732840ffd708ef1aae5abee43f63c4
Reviewed-on: https://chromium-review.googlesource.com/212864
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/gs_fetch_binpkg.py b/scripts/gs_fetch_binpkg.py
index c696064..956dff5 100644
--- a/scripts/gs_fetch_binpkg.py
+++ b/scripts/gs_fetch_binpkg.py
@@ -19,7 +19,6 @@
from chromite.lib import cros_build_lib
from chromite.lib import gs
from chromite.lib import osutils
-from chromite.lib import retry_util
def GetParser():
@@ -46,8 +45,7 @@
options = parser.parse_args(argv)
ctx = gs.GSContext(retries=0)
try:
- retry_util.RetryCommand(Copy, ctx.DEFAULT_RETRIES, ctx, options.uri,
- options.filename, sleep=ctx.DEFAULT_SLEEP_TIME)
- except (gs.GSContextException, cros_build_lib.RunCommandError) as ex:
+ Copy(ctx, options.uri, options.filename)
+ except gs.GSContextException as ex:
# Hide the stack trace using Die.
cros_build_lib.Die('%s', ex)