[rhmessaging-commits] rhmessaging commits: r3597 - in mgmt/trunk: mint/python/mint and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2009-08-31 11:06:39 -0400 (Mon, 31 Aug 2009)
New Revision: 3597

Modified:
   mgmt/trunk/cumin/bin/cumin
   mgmt/trunk/mint/python/mint/main.py
Log:
Also look for a cumin.conf file; no need to set the default mint home

Modified: mgmt/trunk/cumin/bin/cumin
===================================================================
--- mgmt/trunk/cumin/bin/cumin	2009-08-31 14:17:56 UTC (rev 3596)
+++ mgmt/trunk/cumin/bin/cumin	2009-08-31 15:06:39 UTC (rev 3597)
@@ -2,8 +2,6 @@
 
 if [[ "$CUMIN_HOME" ]]; then
     export MINT_HOME="$CUMIN_HOME"
-else
-    export MINT_HOME="/var/lib/cumin"
 fi
 
 function die {

Modified: mgmt/trunk/mint/python/mint/main.py
===================================================================
--- mgmt/trunk/mint/python/mint/main.py	2009-08-31 14:17:56 UTC (rev 3596)
+++ mgmt/trunk/mint/python/mint/main.py	2009-08-31 15:06:39 UTC (rev 3597)
@@ -107,7 +107,10 @@
   def init(self, opts=None):
     super(MintConfig, self).init()
 
+    self.load_file(os.path.join(self.home, "etc", "cumin.conf"))
     self.load_file(os.path.join(self.home, "etc", "mint.conf"))
+
+    self.load_file(os.path.join(os.path.expanduser("~"), ".cumin.conf"))
     self.load_file(os.path.join(os.path.expanduser("~"), ".mint.conf"))
 
     if opts: