[checkmk-commits] Cleaned up site_is_empty()

Module: check_mk Branch: master Commit: adbbf865a63eb54bf5211f256d0fa1ff47f2b1a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adbbf865a63eb5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 10 23:49:13 2018 +0200 Cleaned up site_is_empty() Change-Id: If95d537e3ccbe6debf22151e816d17c77163be45 --- omd/packages/omd/omdlib/main.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index ffa087f..3bf4271 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -579,12 +579,6 @@ def site_is_stopped(sitename): def site_is_running(sitename): return check_status(sitename, False) == 0 -def site_is_empty(site): - for entry in os.listdir(site.dir): - if entry not in [ '.', '..' ]: - return False - return True - # Determines wether a specific site is set to autostart. Note that # this needs to be called from a non-site-specific context and # can there not use the g_site... variables. @@ -2648,7 +2642,7 @@ def main_init(args, options): bail_out("Cannot initialize site that is not disabled.\n" "Please call 'omd disable %s' first." % g_site.name) - if not site_is_empty(g_site): + if not g_site.is_empty(): if not opt_force: bail_out("The site's home directory is not empty. Please add use\n" "'omd --force init %s' if you want to erase all data." % g_site.name) @@ -4110,6 +4104,11 @@ class AbstractSiteContext(object): raise NotImplementedError() + @abc.abstractmethod + def is_empty(self): + raise NotImplementedError() + + class SiteContext(AbstractSiteContext): @property @@ -4159,6 +4158,14 @@ class SiteContext(AbstractSiteContext): return os.path.exists(self.dir) + def is_empty(self): + for entry in os.listdir(self.dir): + if entry not in [ '.', '..' ]: + return False + return True + + + class RootContext(AbstractSiteContext): def __init__(self): @@ -4187,6 +4194,10 @@ class RootContext(AbstractSiteContext): return False + def is_empty(self): + return False + + exclude_options = [ ( "no-rrds", None, False, "do not copy RRD files (performance data)"),