[checkmk-commits] Fix OMD after yesterdays changes

Module: check_mk Branch: master Commit: 8444c5ae36c802f15f6eaa294164e069696c29e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8444c5ae36c802… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 16 09:48:56 2018 +0100 Fix OMD after yesterdays changes * Fixed missing variable replacement * Fixed missing version patching during integration tests Change-Id: Ie5f4c8ea94ad67d535ef743ee038c11149a4b194 --- omd/packages/omd/omdlib/main.py | 8 ++++---- tests/testlib/__init__.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index cebb6ab..3010923 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -2720,7 +2720,7 @@ def main_rm(site, args, options=None): kill_site_user_processes(site, exclude_current_and_parents=True) if tmpfs_mounted(site.name): - unmount_tmpfs(site.name, kill=kill) + unmount_tmpfs(site, kill=kill) if not reuse: remove_from_fstab(site) @@ -2756,7 +2756,7 @@ def main_disable(site, args, options): sys.exit(0) stop_if_not_stopped(site) - unmount_tmpfs(site.name, kill = "kill" in options) + unmount_tmpfs(site, kill = "kill" in options) sys.stdout.write("Disabling Apache configuration for this site...") delete_apache_hook(site.name) ok() @@ -2840,7 +2840,7 @@ def main_mv_or_cp(old_site, what, args, options=None): "PIDs: %s" % (action, old_site.name, old_site.name, " ".join(pids))) if what == "mv": - unmount_tmpfs(old_site.name, kill = "kill" in options) + unmount_tmpfs(old_site, kill = "kill" in options) if not reuse: remove_from_fstab(old_site) @@ -3050,7 +3050,7 @@ def main_update(site, args, options=None): # Unmount tmp. We need to recreate the files and directories # from the new version after updating. - unmount_tmpfs(site.name) + unmount_tmpfs(site) # Source version: the version of the site we deal with from_version = site.version diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 6a984f2..24a1dfb 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -593,7 +593,7 @@ class Site(object): execute("sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path())) - execute("sudo sed -i \"s|%s|%s|g\" %s/bin/omd" % + execute("sudo sed -i \"s|%s|%s|g\" %s/lib/python/omdlib/__init__.py" % (src_version, new_version_name, self.version.version_path())) execute("sudo sed -i \"s|%s|%s|g\" %s/share/omd/omd.info" %