Bug 1310749 - Fix grep in lightning-packager.mk for gdata-provider. r=philipp a=aleth
authoraleth <aleth@instantbird.org>
Tue, 18 Oct 2016 10:49:05 +0200
changeset 27609 bd21c84fff3b7a6efb62a047efbcbece547c4419
parent 27608 04ac4277680857a64fc1b85bc86cf133a7ca8335
child 27610 3b1135003acf47a829a8d832e160488e50c62d6d
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp, aleth
bugs1310749
Bug 1310749 - Fix grep in lightning-packager.mk for gdata-provider. r=philipp a=aleth
calendar/lightning/lightning-packager.mk
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -135,17 +135,17 @@ clobber-%:
 
 repackage-zip-%:
 	@echo "Already repackaged zip for $* in langpack step"
 
 repack-stage:
 	@echo "Repackaging $(XPI_PKGNAME) locale for Language $(AB_CD)"
 	$(RM) -rf $(L10N_TARGET)
 	cp -R $(XPI_STAGE_PATH)/$(XPI_NAME) $(L10N_TARGET)
-	grep -v 'locale \w\+ en-US' $(L10N_TARGET)/chrome.manifest > $(L10N_TARGET)/chrome.manifest~ && \
+	grep -v 'locale \D\+ en-US' $(L10N_TARGET)/chrome.manifest > $(L10N_TARGET)/chrome.manifest~ && \
 	  mv $(L10N_TARGET)/chrome.manifest~ $(L10N_TARGET)/chrome.manifest
 	find $(abspath $(L10N_TARGET)) -name '*en-US*' -print0 | xargs -0 rm -rf
 
 
 # Actual locale packaging targets. If L10N_XPI_NAME is set, then use it.
 # Otherwise keep the original XPI_NAME
 # Overriding the final target is a bit of a hack for universal builds
 # so that we can ensure we get the right xpi that gets repacked.