From 9f47d530f2dbdce2e32fd3b2ab515f2c9c957d7a Mon Sep 17 00:00:00 2001 From: Erik Nordin Date: Wed, 16 Oct 2024 15:52:16 -0500 Subject: [PATCH] fix: ensure strip_components and add_prefix are respected in repack_archive --- src/taskgraph/run-task/fetch-content | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/taskgraph/run-task/fetch-content b/src/taskgraph/run-task/fetch-content index f7d0819d9..ae028d767 100755 --- a/src/taskgraph/run-task/fetch-content +++ b/src/taskgraph/run-task/fetch-content @@ -814,12 +814,11 @@ def command_static_url(args): if gpg_sig_url: gpg_verify_path(dl_dest, gpg_key, gpg_signature) - if dl_dest != dest: - if should_repack_archive(dl_dest, dest, args.strip_components, args.add_prefix): - repack_archive(dl_dest, dest, args.strip_components, args.add_prefix) - else: - log(f"Renaming {dl_dest} to {dest}") - dl_dest.rename(dest) + if should_repack_archive(dl_dest, dest, args.strip_components, args.add_prefix): + repack_archive(dl_dest, dest, args.strip_components, args.add_prefix) + elif dl_dest != dest: + log(f"Renaming {dl_dest} to {dest}") + dl_dest.rename(dest) except Exception: try: