Skip to content

Fix no_progress parameter in superpmi #57377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2021
Merged

Fix no_progress parameter in superpmi #57377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/coreclr/scripts/superpmi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2563,8 +2563,9 @@ def filter_local_path(path):
urls = [url for url in urls if filter_local_path(url)]

# Download all the urls at once, and add the local cache filenames to our accumulated list of local file names.
skip_progress = hasattr(coreclr_args, 'no_progress') and coreclr_args.no_progress
if len(urls) != 0:
local_mch_files += download_files(urls, mch_cache_dir, display_progress=not coreclr_args.no_progress)
local_mch_files += download_files(urls, mch_cache_dir, display_progress=not skip_progress)

# Special case: walk the URLs list and for every ".mch" or ".mch.zip" file, check to see that either the associated ".mct" file is already
# in the list, or add it to a new list to attempt to download (but don't fail the download if it doesn't exist).
Expand All @@ -2575,7 +2576,7 @@ def filter_local_path(path):
if mct_url not in urls:
mct_urls.append(mct_url)
if len(mct_urls) != 0:
local_mch_files += download_files(mct_urls, mch_cache_dir, fail_if_not_found=False, display_progress=not coreclr_args.no_progress)
local_mch_files += download_files(mct_urls, mch_cache_dir, fail_if_not_found=False, display_progress=not skip_progress)

# Even though we might have downloaded MCT files, only return the set of MCH files.
local_mch_files = [file for file in local_mch_files if any(file.lower().endswith(extension) for extension in [".mch"])]
Expand Down Expand Up @@ -2670,8 +2671,8 @@ def filter_superpmi_collections(path):
blob_url_prefix = "{}/{}/".format(az_blob_storage_superpmi_container_uri, az_collections_root_folder)
urls = [blob_url_prefix + path for path in paths]

return download_files(urls, target_dir, display_progress=not coreclr_args.no_progress)

skip_progress = hasattr(coreclr_args, 'no_progress') and coreclr_args.no_progress
return download_files(urls, target_dir, display_progress=not skip_progress)

def download_files(paths, target_dir, verbose=True, fail_if_not_found=True, display_progress=True):
""" Download a set of files, specified as URLs or paths (such as Windows UNC paths),
Expand Down