Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

Win-agent: test df followed by other section

by Jukka Aro

Module: check_mk Branch: master Commit: ef448a7fcc3f909211e0fe4fb946e1d1e845a267 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef448a7fcc3f90… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed May 16 15:36:09 2018 +0200 Win-agent: test df followed by other section Check that the df section is correctly formatted until the end by adding section systemtime after it. This is necessary for ensuring that e. g. the newline is not left out at the end of the df section. Change-Id: I14308dff7f1008faa78f6dca6b994991e13d4830 --- agents/windows/it/test_section_df.py | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/agents/windows/it/test_section_df.py b/agents/windows/it/test_section_df.py index ffb1d71..dc39103 100644 --- a/agents/windows/it/test_section_df.py +++ b/agents/windows/it/test_section_df.py @@ -7,15 +7,23 @@ from remote import (actual_output, config, remotetest, remotedir, wait_agent, write_config) +class Globals(object): + section = 'df' + alone = True + + @pytest.fixture def testfile(): return os.path.basename(__file__) -(a)pytest.fixture -def testconfig(config): - section = 'df' - config.set('global', 'sections', section) +(a)pytest.fixture(params=['alone', 'with_systemtime']) +def testconfig(request, config): + Globals.alone = request.param == 'alone' + if Globals.alone: + config.set('global', 'sections', Globals.section) + else: + config.set('global', 'sections', '%s systemtime' % Globals.section) config.set('global', 'crash_debug', 'yes') return config @@ -23,12 +31,20 @@ def testconfig(config): @pytest.fixture def expected_output(): drive = r'[A-Z]:%s' % re.escape(os.sep) - return [ - re.escape(r'<<<df:sep(9)>>>'), + expected = [ + re.escape(r'<<<%s:sep(9)>>>' % Globals.section), r'%s\s+\w+\s+\d+\s+\d+\s+\d+\s+\d{1,3}%s\s+%s' % (drive, re.escape('%'), drive) ] - - -def test_section_df(testconfig, expected_output, actual_output, testfile): - remotetest(expected_output, actual_output, testfile) + if not Globals.alone: + expected += [ + re.escape(r'<<<systemtime>>>'), + r'\d+' + ] + return expected + + +def test_section_df(request, testconfig, expected_output, actual_output, + testfile): + # request.node.name gives test name + remotetest(expected_output, actual_output, testfile, request.node.name)

6 years, 4 months

cisco_temp_perf: remove old code that was commented out

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e9b2240c4122a6acbce8dd92a27dd7f229e6627c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9b2240c4122a6… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu May 17 15:08:54 2018 +0200 cisco_temp_perf: remove old code that was commented out Change-Id: Ib85fb644c37065fca8fa20eb5c8542601fbdfcde --- checks/cisco_temp_perf | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index fbc48b6..e4be84a 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -58,28 +58,6 @@ def inventory_cisco_temp_perf(info): def check_cisco_temp_perf(item, _no_params, info): for statustext, temp, max_temp, state, oid_end in info: if cisco_sensor_item(statustext, oid_end) == item: -# # FIXME saveint needed here? (See if condition) -# temp = saveint(temp) -# if temp != 0: -# max_temp = max_temp and int(max_temp) or None -# perfdata = [("temp", temp, None, max_temp )] -# temptext = ", Temperature: %d °C" % temp -# if max_temp != None: -# temptext += " (critical at %d °C)" % max_temp -# else: -# perfdata = [] -# temptext = "" -# -# state = int(state) -# statename = cisco_temp_perf_envmon_states.get(state, "(invalid)") -# if state == 1: -# return (0, "state is normal%s" % temptext, perfdata) -# elif state == 2: -# return (1, "state is %s%s" % (statename, temptext), perfdata) -# elif state in [ 5, 6 ]: -# return (3, "state is %s" % statename) -# else: -# return (2, "state is %s%s" % (statename, temptext), perfdata) return 3, "This check is obsolete, please re-inventorize this host"

6 years, 4 months

Use unicode strings in mbg_lantime.include

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1145d61263cacc16aa731be73f3a22b6987c3e99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1145d61263cacc… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu May 17 15:01:22 2018 +0200 Use unicode strings in mbg_lantime.include Change-Id: Ie19248891edab136fc8e70e388f2586e03fdf094 --- checks/mbg_lantime.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/mbg_lantime.include b/checks/mbg_lantime.include index c431681..ca24421 100644 --- a/checks/mbg_lantime.include +++ b/checks/mbg_lantime.include @@ -71,7 +71,7 @@ def check_mbg_lantime_state_common(states, _no_item, params, info): elif pos_refclock_offset >= warn: state = 1 if state != 0: - levels_text = " (warn/crit at %d/%d µs)" % (warn, crit) + levels_text = u" (warn/crit at %d/%d µs)" % (warn, crit) perfdata = [("offset", refclock_offset, warn * 1000, crit * 1000)] # all in us - yield state, "Reference clock offset: %g µs%s" % (refclock_offset, levels_text), perfdata + yield state, u"Reference clock offset: %g µs%s" % (refclock_offset, levels_text), perfdata

6 years, 4 months

6109 FIX temperature.include, etherbox.temp: fix unicode error

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3b47bc8cdb43bc706cc49a371b8b30899c8651c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b47bc8cdb43bc… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu May 17 13:54:59 2018 +0200 6109 FIX temperature.include, etherbox.temp: fix unicode error Use unicode strings for the units in temperature.include and remove UTF-8 decoding in etherbox.temp. Adapt ra32e_sensors tests to work correctly. Change-Id: Ibb50cf652016e1b291b41cc8f936568d003ecedb --- .werks/6109 | 13 +++++++++++++ checks/etherbox | 2 +- checks/temperature.include | 4 ++-- tests/unit/checks/test_ra32e_sensors_check.py | 14 +++++++------- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.werks/6109 b/.werks/6109 new file mode 100644 index 0000000..4d3530e --- /dev/null +++ b/.werks/6109 @@ -0,0 +1,13 @@ +Title: temperature.include, etherbox.temp: fix unicode error +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526558045 + +Use unicode strings for the units in temperature.include and remove +UTF-8 decoding in etherbox.temp. Adapt ra32e_sensors tests to work +correctly. diff --git a/checks/etherbox b/checks/etherbox index 1721f98..61591e0 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -103,7 +103,7 @@ def check_etherbox_temp(item, params, info): uom = { "0": "c", "1": "f", "2": "k" }[info[0][0][0]] temp = int(value) / 10.0 state, infotext, perfdata = check_temperature(temp, params, "etherbox_temp_%s" % item, uom) - return state, "[%s] %s" % (name, infotext.decode("utf8")), perfdata + return state, "[%s] %s" % (name, infotext), perfdata check_info["etherbox.temp"] = { diff --git a/checks/temperature.include b/checks/temperature.include index c7748dc..73268d5 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -82,8 +82,8 @@ def render_temp(n, output_unit, relative=False): return "%.1f" % t temp_unitsym = { - "c": "°C", - "f": "°F", + "c": u"°C", + "f": u"°F", "k": "K", } diff --git a/tests/unit/checks/test_ra32e_sensors_check.py b/tests/unit/checks/test_ra32e_sensors_check.py index b5b2dc4..06df2ed 100644 --- a/tests/unit/checks/test_ra32e_sensors_check.py +++ b/tests/unit/checks/test_ra32e_sensors_check.py @@ -14,7 +14,7 @@ pytestmark = pytest.mark.checks ('ra32e_sensors.humidity', []), ], [ - ('ra32e_sensors', "Internal", {}, BasicCheckResult(0, '20.7 °C', [('temp', 20.70)])), + ('ra32e_sensors', "Internal", {}, BasicCheckResult(0, u'20.7 °C', [('temp', 20.70)])), ('ra32e_sensors', "Heat Index", {}, BasicCheckResult(3, 'no data for sensor')), ('ra32e_sensors.humidity', "Internal", {}, BasicCheckResult(3, 'no data for sensor')), ] @@ -29,7 +29,7 @@ pytestmark = pytest.mark.checks ('ra32e_sensors', "Internal", {}, BasicCheckResult(3, 'no data for sensor')), ('ra32e_sensors', "Heat Index", {}, - BasicCheckResult(0, '20.7 °C', [('temp', 20.70)])), + BasicCheckResult(0, u'20.7 °C', [('temp', 20.70)])), ('ra32e_sensors.humidity', "Internal", {}, BasicCheckResult(0, '60.0%', [('humidity', 60.0, 101, 101, 0, 100)])), ] @@ -41,7 +41,7 @@ pytestmark = pytest.mark.checks ], [ ('ra32e_sensors', "Sensor 2", {}, - BasicCheckResult(0, '25.8 °C', [('temp', 25.8)])), + BasicCheckResult(0, u'25.8 °C', [('temp', 25.8)])), ] ), ( # temp/active sensor @@ -52,7 +52,7 @@ pytestmark = pytest.mark.checks ], [ ('ra32e_sensors', "Sensor 5", {'levels': (30.0, 35.0)}, - BasicCheckResult(1, '31.0 °C (warn/crit at 30.0/35.0 °C)', [('temp', 31.0, 30.0, 35.0)])), + BasicCheckResult(1, u'31.0 °C (warn/crit at 30.0/35.0 °C)', [('temp', 31.0, 30.0, 35.0)])), ('ra32e_sensors.power', "Sensor 5", {}, BasicCheckResult(2, 'Device status: no power detected(2)')), ('ra32e_sensors.power', "Sensor 5", {'map_device_states': [('no power detected', 1)]}, @@ -69,13 +69,13 @@ pytestmark = pytest.mark.checks ], [ ('ra32e_sensors', "Sensor 8", {}, - BasicCheckResult(0, '25.8 °C', [('temp', 25.8)])), + BasicCheckResult(0, u'25.8 °C', [('temp', 25.8)])), ('ra32e_sensors', "Heat Index 1", {'levels': (27.0, 28.0)}, - BasicCheckResult(2, '28.0 °C (warn/crit at 27.0/28.0 °C)', [('temp', 28.0, 27.0, 28.0)])), + BasicCheckResult(2, u'28.0 °C (warn/crit at 27.0/28.0 °C)', [('temp', 28.0, 27.0, 28.0)])), ('ra32e_sensors.voltage', "Sensor 8", {'voltage': (210, 180)}, BasicCheckResult(1, 'Voltage: 200 V (warn/crit below 210/180 V)', [('voltage', 200)])), ('ra32e_sensors', "Sensor 1", {'levels_lower': (30.0, 25.0)}, - BasicCheckResult(1, '27.9 °C (warn/crit below 30.0/25.0 °C)', [('temp', 27.9)])), + BasicCheckResult(1, u'27.9 °C (warn/crit below 30.0/25.0 °C)', [('temp', 27.9)])), ('ra32e_sensors.humidity', "Sensor 1", {'levels_lower': (85.0, 75.0)}, BasicCheckResult(1, '75.0% (warn/crit below 85.0%/75.0%)', [('humidity', 75.0, None, None, 0, 100)])), ]),

6 years, 4 months

RPMs: Only try to cleanup legacy things from /etc/fstab in case it exists

by Lars Michelsen

Module: check_mk Branch: master Commit: 0eeb635ebb5275ebae902c132b737528ff96d174 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0eeb635ebb5275… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 17 13:20:00 2018 +0200 RPMs: Only try to cleanup legacy things from /etc/fstab in case it exists Change-Id: I87037397dd601ca76f63dae6fd08ce064ef30d22 --- omd/omd.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/omd/omd.spec.in b/omd/omd.spec.in index a746cd0..fc11f34 100644 --- a/omd/omd.spec.in +++ b/omd/omd.spec.in @@ -148,7 +148,9 @@ chkconfig --add @APACHE_NAME@ >/dev/null 2>&1 chkconfig @APACHE_NAME@ on >/dev/null 2>&1 # RHEL / CENTOS >= 6.4, remove symlinks from existing sites in /etc/fstab -sed -i "s/^tmpfs \/omd\/sites/tmpfs \/opt\/omd\/sites/" /etc/fstab +if [ -e /etc/fstab ]; then + sed -i "s/^tmpfs \/omd\/sites/tmpfs \/opt\/omd\/sites/" /etc/fstab +fi # ensure apache is running service @APACHE_NAME@ start >/dev/null 2>&1

6 years, 4 months

Fixed issue in recent change

by Lars Michelsen

Module: check_mk Branch: master Commit: bc21e4a27727dda23f426b5c1dca05b7096fc5c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc21e4a27727dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 17 13:52:34 2018 +0200 Fixed issue in recent change Change-Id: Icac1235f231c3cbc4dd57b99adc21e7598a74249 --- omd/omd.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/omd.spec.in b/omd/omd.spec.in index fc11f34..3bb7139 100644 --- a/omd/omd.spec.in +++ b/omd/omd.spec.in @@ -182,7 +182,7 @@ v=$(ls -A /omd/versions 2>/dev/null| sort -n | tail -n 1) if [ -n "$v" ] then DEFAULT_VERSION=$(readlink /omd/versions/default 2>/dev/null) - DEFAULT_VERSION=${DEFAULT_VERSION##*/}} + DEFAULT_VERSION=${DEFAULT_VERSION##*/} if [ "$v" = "$DEFAULT_VERSION" ]; then echo "New default version is $v" ln -sfn "$v" /omd/versions/default

6 years, 4 months

6101 FIX Fixed partial uninstall of Check_MK 1.5 versions (

by Lars Michelsen

leaving sitecustomize.pyc) Message-ID: <5afd7146.5TWHjjFuWE7zdHkT%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 62f538266514779ee6dd1db2086e28b1c5c7dd3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62f53826651477… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 17 14:05:43 2018 +0200 6101 FIX Fixed partial uninstall of Check_MK 1.5 versions (leaving sitecustomize.pyc) The python delivered with Check_MK was not precompiling the lib/python2.7/sitecustomize.pyc during packaging. It was then created during runtime on the target system. Since this file is not under control of the RPM/DEB packages the file was left on the filesystem after uninstall. The version was still visible after removal in "omd version" output until one removed the /omd/versions/[version] directory. Change-Id: Ie7eb6e4b68589f598dfd7c654f2de87c7cc8ff15 --- .werks/6101 | 15 +++++++++++++++ omd/packages/python/.gitignore | 1 + omd/packages/python/Makefile | 11 +++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.werks/6101 b/.werks/6101 new file mode 100644 index 0000000..30f2f99 --- /dev/null +++ b/.werks/6101 @@ -0,0 +1,15 @@ +Title: Fixed partial uninstall of Check_MK 1.5 versions (leaving sitecustomize.pyc) +Level: 1 +Component: packages +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526558604 + +The python delivered with Check_MK was not precompiling the lib/python2.7/sitecustomize.pyc +during packaging. It was then created during runtime on the target system. Since this file +is not under control of the RPM/DEB packages the file was left on the filesystem after +uninstall. The version was still visible after removal in "omd version" output until one +removed the /omd/versions/[version] directory. diff --git a/omd/packages/python/.gitignore b/omd/packages/python/.gitignore index b5d449b..2020b77 100644 --- a/omd/packages/python/.gitignore +++ b/omd/packages/python/.gitignore @@ -2,3 +2,4 @@ Python-2.7.1? bin/ build/ destdir/ +sitecustomize.pyc diff --git a/omd/packages/python/Makefile b/omd/packages/python/Makefile index 8e05038..7297e3b 100644 --- a/omd/packages/python/Makefile +++ b/omd/packages/python/Makefile @@ -40,6 +40,13 @@ build: bin/gcc bin/g++ # python-modules, ...) during compilation and install targets. # NOTE: -j1 seems to be necessary when --enable-optimizations is used PATH="$(abspath bin):$$PATH" ; $(MAKE) -j1 -C $(DIR) DESTDIR=$(PACKAGE_PYTHON_DESTDIR) install + $(MAKE) sitecustomize.pyc + +sitecustomize.pyc: sitecustomize.py + export PYTHONPATH="$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH)" ; \ + export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \ + export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ + $(PACKAGE_PYTHON_EXECUTABLE) -m py_compile sitecustomize.py # The compiler detection code below is basically what part of AC_PROC_CXX does. bin/gcc: @@ -87,12 +94,12 @@ install: bin/gcc bin/g++ $(DESTDIR)$(OMD_ROOT)/bin/pydoc \ $(DESTDIR)$(OMD_ROOT)/bin/python2.7-config \ $(DESTDIR)$(OMD_ROOT)/bin/2to3 - install -m 644 sitecustomize.py $(DESTDIR)$(OMD_ROOT)/lib/python2.7/ + install -m 644 sitecustomize.py sitecustomize.pyc $(DESTDIR)$(OMD_ROOT)/lib/python2.7/ skel: clean: - rm -rf $(DIR) bin build $(PACKAGE_PYTHON_DESTDIR) + rm -rf $(DIR) bin build $(PACKAGE_PYTHON_DESTDIR) sitecutomize.pyc upstream: git rm Python-*.tgz

6 years, 4 months

Reserved 20 Werk IDS

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4c9200208b0905e65c68c95f46316fae86dbb548 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c9200208b0905… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu May 17 13:51:01 2018 +0200 Reserved 20 Werk IDS Change-Id: Idf1f8badde3db045a313deb225fc629a2bd3f94e --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 26aa63a..741a573 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6109 +6129

6 years, 4 months

5811 FIX Fixed race condition when creating missing directories

by Andreas Boesl

Module: check_mk Branch: master Commit: 99488aee5075e44595e3c0a16c7e9875c5924c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99488aee5075e4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 17 11:48:09 2018 +0200 5811 FIX Fixed race condition when creating missing directories Creating missing directories could lead to exceptions. This has been fixed Change-Id: Ib57e1868e5d7bcee01ecf2e2665af537cb183efb --- .werks/5811 | 12 ++++++++++++ cmk/store.py | 8 ++++---- cmk_base/checks.py | 4 +--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.werks/5811 b/.werks/5811 new file mode 100644 index 0000000..d314676 --- /dev/null +++ b/.werks/5811 @@ -0,0 +1,12 @@ +Title: Fixed race condition when creating missing directories +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526550430 +Class: fix + +Creating missing directories could lead to exceptions. This has been fixed + + diff --git a/cmk/store.py b/cmk/store.py index 9d1f935..4bdb5d1 100644 --- a/cmk/store.py +++ b/cmk/store.py @@ -93,10 +93,10 @@ def makedirs(path, mode=0770): if type(path) is unicode: return path.encode("utf-8") - if os.path.exists(path): - return - - os.makedirs(path, mode) + try: + os.makedirs(path, mode) + except OSError: + pass #. # .--.mk Configs---------------------------------------------------------. diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 6ba089c..e956c91 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -414,9 +414,7 @@ def _precompile_plugin(path, precompiled_path): code = compile(open(path).read(), path, "exec") plugin_mtime = os.stat(path).st_mtime - if not os.path.exists(os.path.dirname(precompiled_path)): - os.makedirs(os.path.dirname(precompiled_path)) - + store.makedirs(os.path.dirname(precompiled_path)) py_compile.compile(path, precompiled_path, doraise=True)

6 years, 4 months

5812 FIX Fixed Check_MK check helper crashes related to loading of precompiled checks

by Andreas Boesl

Module: check_mk Branch: master Commit: 96e91b87d88ea5aa9a495a28dca1418cbd7703d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e91b87d88ea5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 17 11:57:34 2018 +0200 5812 FIX Fixed Check_MK check helper crashes related to loading of precompiled checks The latest versions no longer read checks as plain text python files (Werk 6046). The operation which generates the precompilated file was not atomic, so a file could be partially written, while being read by another process. This caused various exceptions in multiple checks. Change-Id: I5ef5e0359d3aeec7954e0d08fea857a1f40e1fd4 --- .werks/5812 | 13 ++++++++ omd/packages/python/Makefile | 6 ++++ .../python/patches/pycompile_compile_atomic.dif | 35 ++++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/.werks/5812 b/.werks/5812 new file mode 100644 index 0000000..07efb11 --- /dev/null +++ b/.werks/5812 @@ -0,0 +1,13 @@ +Title: Fixed Check_MK check helper crashes related to loading of precompiled checks +Level: 2 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526550541 +Class: fix + +The latest versions no longer read checks as plain text python files (Werk 6046). +The operation which generates the precompilated file was not atomic, so a file could +be partially written, while being read by another process. +This caused various exceptions in multiple checks. diff --git a/omd/packages/python/Makefile b/omd/packages/python/Makefile index 503535e..8e05038 100644 --- a/omd/packages/python/Makefile +++ b/omd/packages/python/Makefile @@ -8,6 +8,12 @@ DIR = $(NAME)-$(VERSION) build: bin/gcc bin/g++ tar xzf $(DIR).tgz + + set -e ; for p in patches/*.dif ; do \ + echo "applying $$p..." ; \ + patch -p1 -b -d $(DIR) < $$p ; \ + done + # Things are a bit tricky here: For PGO/LTO we need a rather recent compiler, # but we don't want to bake paths to our build system into _sysconfigdata and # friends. Workaround: Find a recent compiler to be used for building and make a diff --git a/omd/packages/python/patches/pycompile_compile_atomic.dif b/omd/packages/python/patches/pycompile_compile_atomic.dif new file mode 100644 index 0000000..a7e844f --- /dev/null +++ b/omd/packages/python/patches/pycompile_compile_atomic.dif @@ -0,0 +1,35 @@ +diff -r 8edfe539d4c6 Lib/py_compile.py +--- a/Lib/py_compile.py Mon May 20 10:34:58 2013 -0400 ++++ b/Lib/py_compile.py Mon May 20 17:46:50 2013 -0400 +@@ -120,13 +120,24 @@ + return + if cfile is None: + cfile = file + (__debug__ and 'c' or 'o') +- with open(cfile, 'wb') as fc: +- fc.write('\0\0\0\0') +- wr_long(fc, timestamp) +- marshal.dump(codeobject, fc) +- fc.flush() +- fc.seek(0, 0) +- fc.write(MAGIC) ++ # Atomically write the pyc/pyo file. Issue #13146. ++ # id() is used to generate a pseudo-random filename. ++ path_tmp = '{}.{}'.format(cfile, id(cfile)) ++ try: ++ with open(path_tmp, 'wb') as fc: ++ fc.write('\0\0\0\0') ++ wr_long(fc, timestamp) ++ marshal.dump(codeobject, fc) ++ fc.flush() ++ fc.seek(0, 0) ++ fc.write(MAGIC) ++ os.rename(path_tmp, cfile) ++ except OSError: ++ try: ++ os.unlink(path_tmp) ++ except OSError: ++ pass ++ raise + + def main(args=None): + """Compile several source files.

6 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018