[omd-commits] OMD Git: omd: FIX: Fixed "omd umount" command when running without specific site

git version control git at mathias-kettner.de
Sun Dec 25 01:36:18 CET 2011


Module:   omd
Branch:   master
Commit:   59f430252281a677442056fe50f5950616d81bf3
URL:      http://omdistro.org/projects/omd/repository/revisions/59f430252281a677442056fe50f5950616d81bf3

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Sun Dec 25 01:36:11 2011 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Sun Dec 25 01:36:11 2011 +0100

FIX: Fixed "omd umount" command when running without specific site

---

 Changelog        |    2 ++
 packages/omd/omd |   10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index a3bdfa8..c0f9613 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 This file documents the revision history for the Open Monitoring Distribution
 0.54
+          - omd:
+	    - FIX: Fixed "omd umount" command when running without specific site
           - mod_python: Fix "omd stop apache", which was sometimes timing out
           - NagVis: Updated to NagVis 1.6.2
 
diff --git a/packages/omd/omd b/packages/omd/omd
index 10e3d58..4898dfd 100644
--- a/packages/omd/omd
+++ b/packages/omd/omd
@@ -692,7 +692,8 @@ def unmount_tmpfs(sitename, output = True):
                 sys.stdout.write("Cleaning up temp filesystem...")
                 sys.stdout.flush()
             delete_user_file(tmp)
-            ok()
+            if output:
+                ok()
         return True
 
     if tmpfs_mounted(sitename):
@@ -701,7 +702,8 @@ def unmount_tmpfs(sitename, output = True):
 
         for t in range(0, 10):
             if 0 == os.system("umount '%s'" % tmp_dir(sitename)):
-                ok()
+                if output:
+                    ok()
                 return True
 
             if output:
@@ -2625,6 +2627,10 @@ def main_umount(args, options = {}):
     if not g_sitename:
         exit_status = 0
         for site in all_sites():
+            # Set global vars for the current site
+            g_sitename = site
+            g_sitedir = site_dir(g_sitename)
+
             if only_version and site_version(site) != only_version:
                 continue
 



More information about the omd-commits mailing list