- don't fail build in case build stats writing fails

diff --git a/firefox60-esr.spec b/firefox60-esr.spec
index bd7c59c415a76cf7ba4f08d54b018ecf15708dba..51b1860ca399768481e8ebd4528b17ab85b329ca 100644 (file)
--- a/firefox60-esr.spec
+++ b/firefox60-esr.spec
@@ -262,6 +262,7 @@ Patch7:             %{origname}-middle_click_paste.patch
 Patch8:                %{origname}-system-virtualenv.patch
 Patch9:                %{origname}-Disable-Firefox-Health-Report.patch
 Patch10:       system-cairo.patch
+Patch11:       ignore-stats-errors.patch
 URL:           https://www.mozilla.org/firefox/
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
@@ -2078,6 +2079,7 @@ unpack() {
 %patch8 -p2
 %patch9 -p1
 %{?with_system_cairo:%patch10 -p1}
+%patch11 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' xpcom/typelib/xpt/tools/xpt.py xpcom/idl-parser/xpidl/xpidl.py
 

diff --git a/ignore-stats-errors.patch b/ignore-stats-errors.patch
new file mode 100644 (file)
index 0000000..afadc65
--- /dev/null
+++ b/ignore-stats-errors.patch
@@ -0,0 +1,10 @@
+--- firefox-60.7.0/python/mozbuild/mozbuild/controller/building.py~    2019-05-14 21:13:24.000000000 +0200
++++ firefox-60.7.0/python/mozbuild/mozbuild/controller/building.py     2019-05-26 20:22:50.485588101 +0200
+@@ -322,6 +322,7 @@
+             self.log(logging.WARNING, 'build_resources_error',
+                 {'msg': str(e)},
+                 'Exception when writing resource usage file: {msg}')
++            pass
+ 
+     def _get_finder_cpu_usage(self):
+         """Obtain the CPU usage of the Finder app on OS X.