Bug 1382571 - Remove support for tooltool manifest filtering in `mach artifact toolchain`. r?gps
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1838,35 +1838,27 @@ class PackageFrontend(MachCommandBase):
name = os.path.basename(artifact_name)
records[name] = DownloadRecord(
get_artifact_url(task_id, artifact_name),
name, None, None, None, unpack=True)
# Handle the list of files of the form path@task-id on the command
# line. Each of those give a path to an artifact to download.
- # For backwards compatibility with mozboot's
- # install_tooltool_clang_package (until that is migrated to use
- # --from-build), files without a @ are considered as a filter over the
- # tooltool manifest contents.
for f in files:
- if '@' in f:
- name, task_id = f.rsplit('@', 1)
- records[name] = DownloadRecord(
- get_artifact_url(task_id, name), os.path.basename(name),
- None, None, None, unpack=True)
-
- files = tuple(f for f in files if '@' not in f)
+ if '@' not in f:
+ self.log(logging.ERROR, 'artifact', {},
+ 'Expected a list of files of the form path@task-id')
+ return 1
+ name, task_id = f.rsplit('@', 1)
+ records[name] = DownloadRecord(
+ get_artifact_url(task_id, name), os.path.basename(name),
+ None, None, None, unpack=True)
for record in records.itervalues():
- if files and not any(record.basename == f or
- record.basename.startswith('%s.' % f)
- for f in files):
- continue
-
self.log(logging.INFO, 'artifact', {'name': record.basename},
'Downloading {name}')
valid = False
# sleeptime is 60 per retry.py, used by tooltool_wrapper.sh
for attempt, _ in enumerate(redo.retrier(attempts=retry+1,
sleeptime=60)):
try:
record.fetch_with(cache)