Bug 1362611 - Fix packager quoting in the installer. r=mshal, a=release FIREFOX_54_0b9_BUILD1 FIREFOX_54_0b9_RELEASE
authorRonald Claveau <sousmangoosta@ovh.fr>
Tue, 16 May 2017 21:57:59 +0200
changeset 581848 54f218cec92ffcc2cc8160ed80c58ffe8b6c268d
parent 581847 ad4fa51c539f0f378b428cfc1d5ad36342c177e9
child 581849 0970997adcd5975c34f0969ffb6e865ed613f7ed
push id59898
push userfmarier@mozilla.com
push dateFri, 19 May 2017 23:56:54 +0000
reviewersmshal, release
bugs1362611
milestone54.0
Bug 1362611 - Fix packager quoting in the installer. r=mshal, a=release This patch fixes the upload/packaging build step for Thunderbird beta builds MozReview-Commit-ID: K2qcZ4pLvtN
toolkit/mozapps/installer/upload-files.mk
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -110,23 +110,23 @@ endif
 
 ifeq ($(MOZ_PKG_FORMAT),ZIP)
   ifdef MOZ_EXTERNAL_SIGNING_FORMAT
     # We can't use sha2signcode on zip files
     MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out sha2signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
   endif
   PKG_SUFFIX	= .zip
   INNER_MAKE_PACKAGE = $(call py_action,make_zip,'$(MOZ_PKG_DIR)' '$(PACKAGE)')
-  INNER_UNMAKE_PACKAGE = $(call py_action,make_unzip,'$(UNPACKAGE)')
+  INNER_UNMAKE_PACKAGE = $(call py_action,make_unzip,$(UNPACKAGE))
 endif
 
 ifeq ($(MOZ_PKG_FORMAT),SFX7Z)
   PKG_SUFFIX	= .exe
   INNER_MAKE_PACKAGE = $(call py_action,7z_exe_archive,'$(MOZ_PKG_DIR)' '$(MOZ_INSTALLER_PATH)/app.tag' '$(MOZ_SFX_PACKAGE)' '$(PACKAGE)')
-  INNER_UNMAKE_PACKAGE = $(call py_action,7z_exe_extract,'$(UNPACKAGE)' '$(MOZ_PKG_DIR)')
+  INNER_UNMAKE_PACKAGE = $(call py_action,7z_exe_extract,$(UNPACKAGE) $(MOZ_PKG_DIR))
 endif
 
 #Create an RPM file
 ifeq ($(MOZ_PKG_FORMAT),RPM)
   PKG_SUFFIX  = .rpm
   MOZ_NUMERIC_APP_VERSION = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[^0-9.].*//' )
   MOZ_RPM_RELEASE = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[0-9.]*//' )