855223 - Packaging fails when using a symlink format with: TypeError: fatal() takes exactly 2 arguments (3 given)

Status: RESOLVED FIXED

Description

[Panos Astithas (he/him) [:past] (please ni?)]

Created attachment 730035 [details] [diff] [review]
Patch v1

Symlink format causes an incorrect error to appear when running 'mach package':

past@deck:fx-team$ mach package
 0:01.31 /opt/local/bin/gmake -C . -j8 -s -w package
 0:01.33 gmake: Entering directory `/Users/past/src/fx-team/obj-ff-dbg'
 0:01.53 gmake[1]: Entering directory `/Users/past/src/fx-team/obj-ff-dbg/browser/installer'
 0:01.72 gmake[2]: Entering directory `/Users/past/src/fx-team/obj-ff-dbg/browser/installer'
 0:01.90 gmake[3]: Entering directory `/Users/past/src/fx-team/obj-ff-dbg/browser/installer'
 0:06.23 Traceback (most recent call last):
 0:06.24 File "/Users/past/src/fx-team/toolkit/mozapps/installer/packager.py", line 373, in <module>
 0:06.24 main()
 0:06.24 File "/Users/past/src/fx-team/toolkit/mozapps/installer/packager.py", line 274, in main
 0:06.24 errors.fatal('Unknown format: %s', format)
 0:06.24 TypeError: fatal() takes exactly 2 arguments (3 given)
 0:06.24 gmake[3]: *** [stage-package] Error 1
 0:06.24 gmake[3]: Leaving directory `/Users/past/src/fx-team/obj-ff-dbg/browser/installer'
 0:06.24 gmake[2]: *** [make-package] Error 2
 0:06.24 gmake[2]: Leaving directory `/Users/past/src/fx-team/obj-ff-dbg/browser/installer'
 0:06.24 gmake[1]: *** [default] Error 2
 0:06.24 gmake[1]: Leaving directory `/Users/past/src/fx-team/obj-ff-dbg/browser/installer'
 0:06.24 gmake: *** [package] Error 2
 0:06.24 gmake: Leaving directory `/Users/past/src/fx-team/obj-ff-dbg'


With this patch, the error I get is the more descriptive:

mozpack.errors.ErrorMessage: Error: Unknown format: symlink

Comment 1

[Panos Astithas (he/him) [:past] (please ni?)]

https://hg.mozilla.org/integration/fx-team/rev/61a419957390

Comment 2

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/61a419957390