Bug 1549206. Fix the Eclipse CDT index deletion glob pattern to only match the project name. r=botond
authorJonathan Watt <jwatt@jwatt.org>
Tue, 23 Apr 2019 09:37:09 +0100
changeset 534937 220720dbc492807edbcc203d1dab95b632ec4a00
parent 534936 efed47379383b1fc34b70f4bb78dbc5b694e2107
child 534938 fd9b8188501938a9306105a01db5beeefeab1a19
child 535043 d513a09214181f9bd07747593ff8eb46d05f4bb4
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs1549206
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1549206. Fix the Eclipse CDT index deletion glob pattern to only match the project name. r=botond Differential Revision: https://phabricator.services.mozilla.com/D30281
python/mozbuild/mozbuild/backend/cpp_eclipse.py
--- a/python/mozbuild/mozbuild/backend/cpp_eclipse.py
+++ b/python/mozbuild/mozbuild/backend/cpp_eclipse.py
@@ -207,20 +207,20 @@ class CppEclipseBackend(CommonBackend):
 
     def _write_noindex(self):
         noindex_path = os.path.join(self._project_dir, '.settings/org.eclipse.cdt.core.prefs')
         with open(noindex_path, 'wb') as fh:
             fh.write(NOINDEX_TEMPLATE);
 
     def _remove_noindex(self):
         # Below we remove the config file that temporarily disabled the indexer
-        # while we were importing the project. Unfornutanely, CDT doesn't
+        # while we were importing the project. Unfortunately, CDT doesn't
         # notice indexer settings changes in config files when it restarts. To
         # work around that we remove the index database here to force it to:
-        for f in glob.glob(os.path.join(self._workspace_lang_dir, "*.pdom")):
+        for f in glob.glob(os.path.join(self._workspace_lang_dir, "Gecko.*.pdom")):
             os.remove(f)
 
         noindex_path = os.path.join(self._project_dir, '.settings/org.eclipse.cdt.core.prefs')
         # This may fail if the entire tree has been removed; that's fine.
         try:
             os.remove(noindex_path)
         except OSError as e:
             if e.errno != errno.ENOENT: