Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Sven Panne

Module: check_mk Branch: master Commit: fc38651e9b94f7a73339fb04567f9543f1c19eea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc38651e9b94f7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 7 10:46:58 2018 +0100 Refreshed Pipfile.lock. Change-Id: I457b2190183af7870587c2cae35c4bdde88cbbcf --- Pipfile.lock | 81 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 7cfaeec..d28dd86 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "1a9edc6d46115a6e2bdb02e148ca09ebbea42a58b5bd211eb367806d659588e2" + "sha256": "2601703ca86f2db0c59f619db182a2daf3b23c7c0d46ba8b7542024309b1649a" }, "pipfile-spec": 6, "requires": { @@ -435,39 +435,40 @@ }, "psycopg2": { "hashes": [ - "sha256:0b9e48a1c1505699a64ac58815ca99104aacace8321e455072cee4f7fe7b2698", - "sha256:0f4c784e1b5a320efb434c66a50b8dd7e30a7dc047e8f45c0a8d2694bfe72781", - "sha256:0fdbaa32c9eb09ef09d425dc154628fca6fa69d2f7c1a33f889abb7e0efb3909", - "sha256:11fbf688d5c953c0a5ba625cc42dea9aeb2321942c7c5ed9341a68f865dc8cb1", - "sha256:19eaac4eb25ab078bd0f28304a0cb08702d120caadfe76bb1e6846ed1f68635e", - "sha256:3232ec1a3bf4dba97fbf9b03ce12e4b6c1d01ea3c85773903a67ced725728232", - "sha256:36f8f9c216fcca048006f6dd60e4d3e6f406afde26cfb99e063f137070139eaf", - "sha256:59c1a0e4f9abe970062ed35d0720935197800a7ef7a62b3a9e3a70588d9ca40b", - "sha256:6506c5ff88750948c28d41852c09c5d2a49f51f28c6d90cbf1b6808e18c64e88", - "sha256:6bc3e68ee16f571681b8c0b6d5c0a77bef3c589012352b3f0cf5520e674e9d01", - "sha256:6dbbd7aabbc861eec6b910522534894d9dbb507d5819bc982032c3ea2e974f51", - "sha256:6e737915de826650d1a5f7ff4ac6cf888a26f021a647390ca7bafdba0e85462b", - "sha256:6ed9b2cfe85abc720e8943c1808eeffd41daa73e18b7c1e1a228b0b91f768ccc", - "sha256:711ec617ba453fdfc66616db2520db3a6d9a891e3bf62ef9aba4c95bb4e61230", - "sha256:844dacdf7530c5c612718cf12bc001f59b2d9329d35b495f1ff25045161aa6af", - "sha256:86b52e146da13c896e50c5a3341a9448151f1092b1a4153e425d1e8b62fec508", - "sha256:985c06c2a0f227131733ae58d6a541a5bc8b665e7305494782bebdb74202b793", - "sha256:a86dfe45f4f9c55b1a2312ff20a59b30da8d39c0e8821d00018372a2a177098f", - "sha256:aa3cd07f7f7e3183b63d48300666f920828a9dbd7d7ec53d450df2c4953687a9", - "sha256:b1964ed645ef8317806d615d9ff006c0dadc09dfc54b99ae67f9ba7a1ec9d5d2", - "sha256:b2abbff9e4141484bb89b96eb8eae186d77bc6d5ffbec6b01783ee5c3c467351", - "sha256:cc33c3a90492e21713260095f02b12bee02b8d1f2c03a221d763ce04fa90e2e9", - "sha256:d7de3bf0986d777807611c36e809b77a13bf1888f5c8db0ebf24b47a52d10726", - "sha256:db5e3c52576cc5b93a959a03ccc3b02cb8f0af1fbbdc80645f7a215f0b864f3a", - "sha256:e168aa795ffbb11379c942cf95bf813c7db9aa55538eb61de8c6815e092416f5", - "sha256:e9ca911f8e2d3117e5241d5fa9aaa991cb22fb0792627eeada47425d706b5ec8", - "sha256:eccf962d41ca46e6326b97c8fe0a6687b58dfc1a5f6540ed071ff1474cea749e", - "sha256:efa19deae6b9e504a74347fe5e25c2cb9343766c489c2ae921b05f37338b18d1", - "sha256:f4b0460a21f784abe17b496f66e74157a6c36116fa86da8bf6aa028b9e8ad5fe", - "sha256:f93d508ca64d924d478fb11e272e09524698f0c581d9032e68958cfbdd41faef" - ], - "index": "pypi", - "version": "==2.7.5" + "sha256:076351ed3c3b36ea147d456b3eb568be0ec89a29b000349d5b6d8e3e3026f49e", + "sha256:11b5e4f9d1e7e742d6a953e70d19ac5a12db5dc539db929657df676ec475b435", + "sha256:23198892998282d06884897dcb7561c043371c2b33118f1d12c0abbe1d7fd1d5", + "sha256:25c843b5ba383820a027603f3ef7b4d9854602d325295cd82bded15b33b762c9", + "sha256:3474c77a657fc2344f415ac0b5dc053ee0b3cdc84bbcc7cfc8047604b981febc", + "sha256:4460dc9d0132db3483fcedd4f2fb30475fd89a98b9cd563f6ad1dabd59247845", + "sha256:45dd9b3f08e327f23f5e70075738a69f4851c83e91b90b9fe3fe873de8c4e953", + "sha256:58041e8372f077ed4dd37029e6988b2f0859e520d3949a90c4d6456ec47f7c75", + "sha256:5e1d71b33e1712ab691988cd8d8866196e981fd3e353e01ff4604c437b338c75", + "sha256:6f3b5bf74396800738f8c15e6cecf7ce64d0e59f80e1ca5fe5ceedbcdeaac5ed", + "sha256:6ff610d8a5f44f28c27191cbc9025e4a6f8922dbb99b9d3ef0779b9c5ca164d6", + "sha256:707b40dc972223880364fce6eaa42e8fd7946f636e91fc7ccf65beb149e9a489", + "sha256:72448b57b82ece42a7f6c1c50a5ca27c0521f9e31b5d3621d19b2d9434debb32", + "sha256:7d8e4c2639a693a3b87942596a68b2cfc6cfbd66c0997b1adb7b8828bde6c1b7", + "sha256:84cb4591cd8a1238ddabcf8b066d3179fb2e2296679b720e8272f267d9137783", + "sha256:868a251a32f46c2615e034541bf61944b810ba66a2a8efeef7fbeb35d20ba246", + "sha256:87c950f463a11341af2228bc4173d4c47dce2e4d4b9282715b923c8d90b7547d", + "sha256:8cdfef6ca3359f66418c84778506e431fd02a0a4cee10c8f54affef141d9a37f", + "sha256:8e875e864876bf69879221746bacc3479cd5db26245bac4c3b2f9622ee6ac52f", + "sha256:96c08e0d72a1dd7a9314636351a3ed8bdcdf332ec8414da93e81c2cb747ca62d", + "sha256:99b02d34029d163344490212ebd7987b75a18349f5e1925ea77a1e77dd700c12", + "sha256:ab4f2a7d9c43c65ea62f28f549079d3f5f5d5ca54eafb552c765537718a8dbd4", + "sha256:ac8d1231aae6b6849e732e8d021a5f93fa9d8d8bac02c663797a9e6c5ac1607d", + "sha256:c946dd53fd39427051e72707146643660f017388641b9daa2d316fe45af06551", + "sha256:ceadecf660ad4f7a31ea5baef30a7351add8626f9fd3daaafabb9a9e549f3f9a", + "sha256:da8475270687816c500a5874e14b25e120c2e9711dc6f7cf697af6bda31ab741", + "sha256:e0313fb08c883ebc772d11c9ecf0b4ecf8946a37ed6fb3d2b6ad96f833a1af2b", + "sha256:e452672f74f8d4540da0b9df4d50cd26109f05e2ed35015bb0ffe6a0f08e730e", + "sha256:ebabc4ab0bd3fb4e4644cfe5c11c3ba22991ce1c6d40b4755a5f3f144e97e822", + "sha256:ec26d70bc9e5be78334f3df474bb852e078b80d2ac44a069a925f4333a432cc9", + "sha256:f50d0df01a1fe2c0b8e8d74c9eb8f636d09ccea4c7f50eb267eb117bd33b8516" + ], + "index": "pypi", + "version": "==2.7" }, "pyasn1": { "hashes": [ @@ -1207,11 +1208,11 @@ }, "pytest": { "hashes": [ - "sha256:212be78a6fa5352c392738a49b18f74ae9aeec1040f47c81cadbfd8d1233c310", - "sha256:6f6c1efc8d0ccc21f8f6c34d8330baca883cf109b66b3df954b0a117e5528fb4" + "sha256:630ff1dbe04f469ee78faa5660f712e58b953da7df22ea5d828c9012e134da43", + "sha256:a2b5232735dd0b736cbea9c0f09e5070d78fcaba2823a4f6f09d9a81bd19415c" ], "index": "pypi", - "version": "==3.9.2" + "version": "==3.10.0" }, "pytest-cov": { "hashes": [ @@ -1335,10 +1336,10 @@ }, "websocket-client": { "hashes": [ - "sha256:c42b71b68f9ef151433d6dcc6a7cb98ac72d2ad1e3a74981ca22bc5d9134f166", - "sha256:f5889b1d0a994258cfcbc8f2dc3e457f6fc7b32a8d74873033d12e4eab4bdf63" + "sha256:8c8bf2d4f800c3ed952df206b18c28f7070d9e3dcbd6ca6291127574f57ee786", + "sha256:e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849" ], - "version": "==0.53.0" + "version": "==0.54.0" }, "wrapt": { "hashes": [

5 years, 7 months

Semi-automatic yapf for cmk/gui/wato/pages/

by Óscar Nájera

Module: check_mk Branch: master Commit: 0a5d9cf97f5392ba81f2f6d9a9f602dc60113c78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a5d9cf97f5392… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 5 16:15:55 2018 +0100 Semi-automatic yapf for cmk/gui/wato/pages/ CMK-1180 Change-Id: If5dc7a885ab3f139352bba971acdba05b10375d2 --- cmk/gui/wato/pages/activate_changes.py | 50 +++--- cmk/gui/wato/pages/analyze_configuration.py | 82 ++++----- cmk/gui/wato/pages/audit_log.py | 79 ++++----- cmk/gui/wato/pages/automation.py | 22 +-- cmk/gui/wato/pages/backup.py | 52 +----- cmk/gui/wato/pages/bulk_discovery.py | 74 +++------ cmk/gui/wato/pages/bulk_edit.py | 23 +-- cmk/gui/wato/pages/bulk_import.py | 49 ++---- cmk/gui/wato/pages/check_catalog.py | 110 ++++++------ cmk/gui/wato/pages/custom_attributes.py | 53 +++--- cmk/gui/wato/pages/download_agents.py | 17 +- cmk/gui/wato/pages/folders.py | 185 ++++++++++----------- cmk/gui/wato/pages/global_settings.py | 96 ++++------- cmk/gui/wato/pages/groups.py | 79 +++------ cmk/gui/wato/pages/host_diagnose.py | 63 ++++--- cmk/gui/wato/pages/host_rename.py | 79 +++------ cmk/gui/wato/pages/host_tags.py | 134 ++++++--------- cmk/gui/wato/pages/hosts.py | 70 +++----- cmk/gui/wato/pages/icons.py | 16 +- cmk/gui/wato/pages/ldap.py | 63 +++---- cmk/gui/wato/pages/main.py | 6 +- cmk/gui/wato/pages/not_implemented.py | 4 - cmk/gui/wato/pages/notifications.py | 171 ++++++++----------- cmk/gui/wato/pages/object_parameters.py | 77 +++++---- cmk/gui/wato/pages/parentscan.py | 76 ++++----- cmk/gui/wato/pages/password_store.py | 38 ++--- cmk/gui/wato/pages/pattern_editor.py | 58 +++---- cmk/gui/wato/pages/progress.py | 13 +- cmk/gui/wato/pages/random_hosts.py | 10 +- cmk/gui/wato/pages/read_only.py | 16 +- cmk/gui/wato/pages/roles.py | 71 +++----- cmk/gui/wato/pages/rulesets.py | 249 +++++++++++----------------- cmk/gui/wato/pages/search.py | 12 +- cmk/gui/wato/pages/services.py | 170 ++++++++++--------- cmk/gui/wato/pages/sites.py | 108 +++++------- cmk/gui/wato/pages/timeperiods.py | 161 +++++++----------- cmk/gui/wato/pages/users.py | 189 +++++++++++---------- 37 files changed, 1122 insertions(+), 1703 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0a5d9cf97f…

5 years, 7 months

6850 FIX Fixed broken ruleset search reset function

by Lars Michelsen

Module: check_mk Branch: master Commit: 5e98c1a01cfde3bb4c903a3faba7d1546938887c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e98c1a01cfde3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 7 09:18:33 2018 +0100 6850 FIX Fixed broken ruleset search reset function The reset functionality of the ruleset search was not working at all. It always resulted in an exception like: "AttributeError: 'ModeRuleSearch' object has no attribute 'search_options'" Change-Id: Ifb0fe965bd1003d5a411d77762b79026bcb6b97c --- .werks/6850 | 12 ++++++++++++ cmk/gui/wato/pages/rulesets.py | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6850 b/.werks/6850 new file mode 100644 index 0000000..a1373f5 --- /dev/null +++ b/.werks/6850 @@ -0,0 +1,12 @@ +Title: Fixed broken ruleset search reset function +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541518998 + +The reset functionality of the ruleset search was not working at all. It always +resulted in an exception like: "AttributeError: 'ModeRuleSearch' object has no attribute 'search_options'" diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index d4f0336..0ec2143 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -1057,7 +1057,8 @@ class ModeRuleSearch(WatoMode): def _from_vars(self): if html.var("_reset_search"): html.del_all_vars("search_") - return {} + self.search_options = {} + return value = self._valuespec().from_html_vars("search") self._valuespec().validate_value(value, "search")

5 years, 7 months

Update Dokuwiki from 2016-06-26a to 2016-06-26e

by Alex Zurhake

Module: check_mk Branch: master Commit: 987ad58cacff33e50b9251f46fc6a8b31ac6f3ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=987ad58cacff33… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Nov 6 15:36:50 2018 +0100 Update Dokuwiki from 2016-06-26a to 2016-06-26e Change-Id: I12ac8cec7d7731d6d524bfab40b2d145d9ea5679 --- omd/packages/dokuwiki/Makefile | 4 ++-- omd/packages/dokuwiki/dokuwiki-2016-06-26a.tgz | Bin 2251927 -> 0 bytes omd/packages/dokuwiki/dokuwiki-2016-06-26e.tgz | Bin 0 -> 3464178 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/omd/packages/dokuwiki/Makefile b/omd/packages/dokuwiki/Makefile index 4459a6e..976bdc0 100644 --- a/omd/packages/dokuwiki/Makefile +++ b/omd/packages/dokuwiki/Makefile @@ -1,8 +1,8 @@ include ../../Makefile.omd NAME = dokuwiki -VERSION = 2016-06-26a -DIR = $(NAME) +VERSION = 2016-06-26e +DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/omd/packages/dokuwiki/dokuwiki-2016-06-26a.tgz b/omd/packages/dokuwiki/dokuwiki-2016-06-26a.tgz deleted file mode 100644 index 3d70816..0000000 Binary files a/omd/packages/dokuwiki/dokuwiki-2016-06-26a.tgz and /dev/null differ diff --git a/omd/packages/dokuwiki/dokuwiki-2016-06-26e.tgz b/omd/packages/dokuwiki/dokuwiki-2016-06-26e.tgz new file mode 100644 index 0000000..52bfef7 Binary files /dev/null and b/omd/packages/dokuwiki/dokuwiki-2016-06-26e.tgz differ

5 years, 7 months

6673 FIX Checks from mkps did not always replace existing checks

by Andreas Boesl

Module: check_mk Branch: master Commit: ebbd2aa8d86d3c25ce6428561f60a6d1d6e1c2c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebbd2aa8d86d3c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 30 15:33:11 2018 +0100 6673 FIX Checks from mkps did not always replace existing checks Check_MK precompiles check plugins, so that they can be faster reused later on. The mechanism which detects if a plugin needs to be precompiled again, missed the fact that files extracted from mkps may have an older timestamp than the precompiled one. This also applies to old check files which are moved into the local checks dir. Change-Id: I86cba177aca54f5273201300a3e1e5b21dcc35af --- .werks/6673 | 14 ++++++++++++++ cmk_base/config.py | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6673 b/.werks/6673 new file mode 100644 index 0000000..74e6358 --- /dev/null +++ b/.werks/6673 @@ -0,0 +1,14 @@ +Title: Checks from mkps did not always replace existing checks +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1540909691 +Class: fix + +Check_MK precompiles check plugins, so that they can be faster reused later on. +The mechanism which detects if a plugin needs to be precompiled again, missed the fact +that files extracted from mkps may have an older timestamp than the precompiled one. +This also applies to old check files which are moved into the local checks dir. + diff --git a/cmk_base/config.py b/cmk_base/config.py index fdb3d88..7f289be 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2492,7 +2492,8 @@ def _is_plugin_precompiled(path, precompiled_path): except struct.error: return False - if long(os.stat(path).st_mtime) > origin_file_mtime: + + if long(os.stat(path).st_mtime) != origin_file_mtime: return False return True

5 years, 7 months

6674 BI tree: Removed code for legacy computation

by Andreas Boesl

Module: check_mk Branch: master Commit: 5364a114495cdc94145a51681bb1807b4cb77d87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5364a114495cdc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 6 13:48:03 2018 +0100 6674 BI tree: Removed code for legacy computation Change-Id: I62257a93f79c51cd2a2d1c395d4c9f80bd00bcfe --- .werks/6674 | 11 + cmk/gui/bi.py | 342 ++----------------------- cmk/gui/config.py | 8 +- cmk/gui/plugins/dashboard/view.py | 3 - cmk/gui/plugins/wato/check_mk_configuration.py | 22 -- cmk/gui/views.py | 5 - 6 files changed, 34 insertions(+), 357 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5364a11449…

5 years, 7 months

6810 FIX mssql_blocked_sessions: Added wait type "CXCONSUMER"

by Simon Betz

Module: check_mk Branch: master Commit: 41cda4be3cb5d160cc96958090740172669dbfb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41cda4be3cb5d1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 6 15:37:45 2018 +0100 6810 FIX mssql_blocked_sessions: Added wait type "CXCONSUMER" Change-Id: Ieeb4732ca1fc371244a1c1a3ba7ad67f0aba707a --- .werks/6810 | 11 +++++++++++ cmk/gui/plugins/wato/check_parameters.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6810 b/.werks/6810 new file mode 100644 index 0000000..a9b894d --- /dev/null +++ b/.werks/6810 @@ -0,0 +1,11 @@ +Title: mssql_blocked_sessions: Added wait type "CXCONSUMER" +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541515019 + + diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 7b19b25..7a7f17b 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -11389,7 +11389,7 @@ mssql_waittypes = [ "BROKER_REGISTERALLENDPOINTS", "BROKER_SERVICE", "BROKER_SHUTDOWN", "BROKER_TASK_STOP", "BROKER_TO_FLUSH", "BROKER_TRANSMITTER", "BUILTIN_HASHKEY_MUTEX", "CHECK_PRINT_RECORD", "CHECKPOINT_QUEUE", "CHKPT", "CLEAR_DB", "CLR_AUTO_EVENT", "CLR_CRST", "CLR_JOIN", "CLR_MANUAL_EVENT", "CLR_MEMORY_SPY", "CLR_MONITOR", - "CLR_RWLOCK_READER", "CLR_RWLOCK_WRITER", "CLR_SEMAPHORE", "CLR_TASK_START", "CLRHOST_STATE_ACCESS", "CMEMTHREAD", + "CLR_RWLOCK_READER", "CLR_RWLOCK_WRITER", "CLR_SEMAPHORE", "CLR_TASK_START", "CLRHOST_STATE_ACCESS", "CMEMTHREAD", "CXCONSUMER", "CXPACKET", "CXROWSET_SYNC", "DAC_INIT", "DBMIRROR_DBM_EVENT", "DBMIRROR_DBM_MUTEX", "DBMIRROR_EVENTS_QUEUE", "DBMIRROR_SEND", "DBMIRROR_WORKER_QUEUE", "DBMIRRORING_CMD", "DEADLOCK_ENUM_MUTEX", "DEADLOCK_TASK_SEARCH", "DEBUG", "DISABLE_VERSIONING", "DISKIO_SUSPEND", "DISPATCHER_QUEUE_SEMAPHORE", "DLL_LOADING_MUTEX",

5 years, 7 months

Improved ignorance.

by Sven Panne

Module: check_mk Branch: master Commit: 9f27b2329fbfd361f8ca91379726494b194d7a36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f27b2329fbfd3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 6 15:10:50 2018 +0100 Improved ignorance. Change-Id: I29fdcfa221c69b98b0b51ffd983bccc268d8565d --- omd/packages/freetds/.gitignore | 1 + omd/packages/perl-modules/.gitignore | 3 ++- omd/packages/re2/.gitignore | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/omd/packages/freetds/.gitignore b/omd/packages/freetds/.gitignore index 7abc2c3..cec2c26 100644 --- a/omd/packages/freetds/.gitignore +++ b/omd/packages/freetds/.gitignore @@ -1,2 +1,3 @@ +.freetds-build-helper/ destdir/ freetds-[0-9].[0-9][0-9].[0-9][0-9]/ diff --git a/omd/packages/perl-modules/.gitignore b/omd/packages/perl-modules/.gitignore index 0d847a6..0868fd6 100644 --- a/omd/packages/perl-modules/.gitignore +++ b/omd/packages/perl-modules/.gitignore @@ -1,2 +1,3 @@ -destdir/ .deps.cache +.perl-modules-build-helper/ +destdir/ diff --git a/omd/packages/re2/.gitignore b/omd/packages/re2/.gitignore index f615a1a..8057a8f 100644 --- a/omd/packages/re2/.gitignore +++ b/omd/packages/re2/.gitignore @@ -1,2 +1,3 @@ +.re2-build-helper/ destdir/ re2-20??-??-01/

5 years, 7 months

Unbreak pycryptodomex build on SLES11.

by Sven Panne

Module: check_mk Branch: master Commit: e15c31a04d7b44e334d82c7714cb5600c39894b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e15c31a04d7b44… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 6 14:42:59 2018 +0100 Unbreak pycryptodomex build on SLES11. Change-Id: I703d60109e5dcf2da329010d501d8500825a8a87 --- omd/packages/python-modules/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index f924260..67881d8 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -159,6 +159,8 @@ MODULES += passlib-1.7.1.tar.gz .PHONY: build check-freetds install skel clean +# NOTE: Cruel hack below! We need to have a recent GCC visible in the PATH +# because the SSSE3 detection in pycryptodomex is slightly broken. :-/ build: check-python check-freetds unpack set -e ; cd dest && \ mkdir -p $(PACKAGE_PYTHON_MODULES_PYTHONPATH) || true; \ @@ -167,6 +169,7 @@ build: check-python check-freetds unpack export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \ export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS) $(PACKAGE_FREETDS_LDFLAGS)" ; \ export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ + PATH="$(abspath ../python/bin):$$PATH" ; \ for M in $(MODULES); do \ echo "Building $$M..." ; \ PKG=$${M//.tar.gz/} ; \ @@ -200,6 +203,7 @@ unpack: patch -p1 -b -d dest < $$p ; \ done +# NOTE: For the reason for PATH hack, see the 'build' target above. install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python set -e ; cd dest && \ @@ -208,6 +212,7 @@ install: export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \ export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS) $(PACKAGE_FREETDS_LDFLAGS)" ; \ export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ + PATH="$(abspath ../python/bin):$$PATH" ; \ for M in $$(ls); do \ echo "Installing $$M..." ; \ cd $$M ; \

5 years, 7 months

Semi-automatic yapf for cmk/gui/plugins/userdb

by Óscar Nájera

Module: check_mk Branch: master Commit: 5da85a314c380ae100e990fdb44e57370e2f4800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5da85a314c380a… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 5 17:32:05 2018 +0100 Semi-automatic yapf for cmk/gui/plugins/userdb CMK-1180 Change-Id: Ic8b33e3e589ccf9890950bc1637feafbabb25e8a --- cmk/gui/plugins/userdb/__init__.py | 1 - cmk/gui/plugins/userdb/hook_auth.py | 14 +- cmk/gui/plugins/userdb/htpasswd.py | 19 +- cmk/gui/plugins/userdb/ldap_connector.py | 433 +++++++++++++----------------- cmk/gui/plugins/userdb/user_attributes.py | 22 +- cmk/gui/plugins/userdb/utils.py | 22 +- 6 files changed, 207 insertions(+), 304 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5da85a314c…

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018