Bug 1419672: Don't fail to build if compare-locales fails (port Bug 1402401); rs=bustage-fix a=jorgk DONTBUILD
authorTom Prince <mozilla@hocat.ca>
Wed, 22 Nov 2017 08:24:44 -0700
changeset 29394 b66dc48ecfb5d95dfc4b876fb7ea2528eb62acdb
parent 29393 c43f5499c52482498c955966200c02507e0b50b1
child 29395 727004439a415611f0bc5504ae19651757116ce1
child 29397 ca256043000660437bc96b9839e89feb2a56b124
child 29398 85cacd929f84e7339cfad5d3076d15d6ea1f8da9
push id2079
push usermozilla@jorgk.com
push dateWed, 22 Nov 2017 19:59:48 +0000
treeherdercomm-beta@b66dc48ecfb5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix, jorgk
bugs1419672, 1402401
Bug 1419672: Don't fail to build if compare-locales fails (port Bug 1402401); rs=bustage-fix a=jorgk DONTBUILD
calendar/lightning/lightning-packager.mk
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -83,17 +83,17 @@ unpack: $(XPI_ZIP_IN)
 
 # Nothing to package for en-US, its just the usual english xpi
 langpack-en-US:
 	@echo "Skipping $@ as en-US is the default"
 
 merge-%: AB_CD=$*
 merge-%:
 	$(RM) -rf $(REAL_LOCALE_MERGEDIR)/calendar
-	$(moztopsrcdir)/mach compare-locales \
+	-$(moztopsrcdir)/mach compare-locales \
 	    --merge $(REAL_LOCALE_MERGEDIR)/.. \
 	    $(commtopsrcdir)/calendar/locales/l10n.toml \
 	    $(L10NBASEDIR) \
 	    $*
 
 	# This file requires a bugfix with string changes, see bug 1154448
 	[ -f $(L10NBASEDIR)/$*/calendar/chrome/calendar/calendar-extract.properties ] && \
 	  $(RM) $(REAL_LOCALE_MERGEDIR)/calendar/chrome/calendar/calendar-extract.properties \