Bug 1452120: Remove unpacked lightening extension on upgrade; r=Fallen a=tomprince
authorTom Prince <mozilla@hocat.ca>
Fri, 01 Jun 2018 11:24:24 -0600
changeset 31592 a8df3aeef8f3aee25be9e04f6c12b4fe60e7d78d
parent 31591 34b5648fd76a04ea1237c9bca381caa1e94360c2
child 31593 0b6a3c7199c40daef72c45eb795b9694ac8d3438
push id21
push usermozilla@hocat.ca
push dateFri, 13 Jul 2018 19:54:19 +0000
treeherdercomm-esr60@3c593339cb1d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen, tomprince
bugs1452120
Bug 1452120: Remove unpacked lightening extension on upgrade; r=Fallen a=tomprince Differential Revision: https://phabricator.services.mozilla.com/D1491
mail/installer/removed-files.in
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -176,16 +176,26 @@
 # removed by the updater. In some cases (eg, partner builds), distribution/
 # will have other files and/or directories in it. In these cases, the updater
 # will print a non-fatal error and continue on, because we're not appending
 # '*' to force a recursive removal.
 @DIR_MACOS@distribution/
 @DIR_MACOS@distribution/extensions/
 @DIR_MACOS@distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
 
+# Remove unpacked lightning extension.
+#ifdef NIGHTLY_BUILD
+@DIR_RESOURCES@extensions/
+@DIR_RESOURCES@extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/*
+#else
+@DIR_RESOURCES@distribution/
+@DIR_RESOURCES@distribution/extensions/
+@DIR_RESOURCES@distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/*
+#endif
+
 @DIR_MACOS@greprefs/all.js
 @DIR_MACOS@greprefs/security-prefs.js
 @DIR_MACOS@greprefs/xpinstall.js
 @DIR_MACOS@greprefs/
 @DIR_MACOS@hyphenation/
 @DIR_MACOS@hyphenation/hyph_af.dic
 @DIR_MACOS@hyphenation/hyph_bg.dic
 @DIR_MACOS@hyphenation/hyph_ca.dic