Bug 1424098: Support spaces in MOZ_MACBUNDLE_NAME when signing packages; r?glandium draft
authorTom Prince <mozilla@hocat.ca>
Thu, 07 Dec 2017 16:58:34 -0700
changeset 709372 dad430c541a63ad48c5987a507369fba82b396cd
parent 708766 33f7f8631eba673f60834431f1adc131a93308da
child 743408 35f4ba71084f1dd6dbe902cf456c433e986f2dc0
push id92629
push userbmo:mozilla@hocat.ca
push dateFri, 08 Dec 2017 00:12:30 +0000
reviewersglandium
bugs1424098
milestone59.0a1
Bug 1424098: Support spaces in MOZ_MACBUNDLE_NAME when signing packages; r?glandium MozReview-Commit-ID: 4xn1piRnVSU
toolkit/mozapps/installer/upload-files.mk
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -234,17 +234,17 @@ endif
 
 # For final GPG / authenticode signing / dmg signing if required
 ifdef MOZ_EXTERNAL_SIGNING_FORMAT
   MOZ_SIGN_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f))
 endif
 
 ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
   ifeq (Darwin, $(OS_ARCH))
-    MAKE_PACKAGE    = cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_MACBUNDLE_NAME) \
+    MAKE_PACKAGE    = cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) '$(MOZ_MACBUNDLE_NAME)' \
                       && cd $(PACKAGE_BASE_DIR) && $(INNER_MAKE_PACKAGE)
   else
     MAKE_PACKAGE    = $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_PKG_DIR) \
                       && $(INNER_MAKE_PACKAGE)
   endif #Darwin
 
 else
   MAKE_PACKAGE    = $(INNER_MAKE_PACKAGE)