Bug 1382571 - Remove support for tooltool manifest filtering in `mach artifact toolchain`. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 26 Jul 2017 14:41:53 +0900
changeset 371141 6061a480a9b194150791f9bf0708da9ac94c3a7b
parent 371140 f441f40fb1b51c5128151970ad7bb1f37322a3ae
child 371142 43a99fa7cf0291c08a2d2baca422161d8d8ab27f
push id93039
push userkwierso@gmail.com
push dateThu, 27 Jul 2017 01:33:28 +0000
treeherdermozilla-inbound@35b0bdaacb0d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1382571
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1382571 - Remove support for tooltool manifest filtering in `mach artifact toolchain`. r=gps
python/mozbuild/mozbuild/mach_commands.py
--- 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)