Bug 1548008: update glob used to find host-utils in mozproxy r=gbrown
authorAndrew Erickson <aerickson@mozilla.com>
Wed, 01 May 2019 17:28:36 +0000
changeset 530966 bb6e8015f9757fb6c638364e9229abf95c1b21d0
parent 530965 c7a22f0ea7b4ce3ff379f5be1d1ad3070aa76317
child 530967 cf300fac03a9138303b69d90641041a994e51c7d
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1548008
milestone68.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 1548008: update glob used to find host-utils in mozproxy r=gbrown Differential Revision: https://phabricator.services.mozilla.com/D29400
testing/mozbase/mozproxy/mozproxy/backends/mitm.py
--- a/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
+++ b/testing/mozbase/mozproxy/mozproxy/backends/mitm.py
@@ -426,17 +426,17 @@ class MitmproxyAndroid(Mitmproxy):
                 LOG.critical("failed to download the hostutils tooltool manifest")
                 raise
 
             # now use the manifest to download hostutils so we can get certutil
             tooltool_download(_dest, self.config["run_local"], self.mozproxy_dir)
 
             # the production bitbar container host is always linux
             self.certutil = glob.glob(
-                os.path.join(self.mozproxy_dir, "host-utils*[!z]")
+                os.path.join(self.mozproxy_dir, "host-utils*[!z|checksum]")
             )[0]
 
             # must add hostutils/certutil to the path
             os.environ["LD_LIBRARY_PATH"] = self.certutil
 
         bin_suffix = mozinfo.info.get("bin_suffix", "")
         self.certutil = os.path.join(self.certutil, "certutil" + bin_suffix)