Bug 1639521 - Fix Py3 incompatibility in `mach artifact` r=nalexander
authorRicky Stewart <rstewart@mozilla.com>
Wed, 20 May 2020 20:34:51 +0000
changeset 531321 0855a5f132b36b12b78c87f7211d07b731fc431c
parent 531320 2e77f3c6d7f105099f14646e3e30ccde8e7adc19
child 531322 c3ac91c63eeb6037e6c07591d198460703e92279
push id37437
push usernerli@mozilla.com
push dateThu, 21 May 2020 02:34:41 +0000
treeherdermozilla-central@3d91ba9e1d25 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1639521
milestone78.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 1639521 - Fix Py3 incompatibility in `mach artifact` r=nalexander Differential Revision: https://phabricator.services.mozilla.com/D76215
python/mozbuild/mozbuild/artifact_commands.py
--- a/python/mozbuild/mozbuild/artifact_commands.py
+++ b/python/mozbuild/mozbuild/artifact_commands.py
@@ -369,18 +369,17 @@ class PackageFrontend(MachCommandBase):
                         should_retry = status >= 500 or status == 400
                     else:
                         should_retry = True
 
                     if should_retry or attempt < retry:
                         level = logging.WARN
                     else:
                         level = logging.ERROR
-                    # e.message is not always a string, so convert it first.
-                    self.log(level, 'artifact', {}, str(e.message))
+                    self.log(level, 'artifact', {}, str(e))
                     if not should_retry:
                         break
                     if attempt < retry:
                         self.log(logging.INFO, 'artifact', {},
                                  'Will retry in a moment...')
                     continue
                 try:
                     valid = record.validate()