[Csp-commits] svn:csp r1461 - trunk/CSP/CSPSim/Bin

[<sv...@ww...>]

Author: mkrose
Date: 2005-02-05 08:34:01 -0800 (Sat, 05 Feb 2005)
New Revision: 1461

Modified:
   trunk/CSP/CSPSim/Bin/CSPSim.py
Log:
Find CSPSim/Data/CSPSim.ini relative to the CSPSim.py module instead
of the current working directory, and return the absolute path.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1461

Modified: trunk/CSP/CSPSim/Bin/CSPSim.py
===================================================================
--- trunk/CSP/CSPSim/Bin/CSPSim.py	2005-02-05 10:16:18 UTC (rev 1460)
+++ trunk/CSP/CSPSim/Bin/CSPSim.py	2005-02-05 16:34:01 UTC (rev 1461)
@@ -269,14 +269,14 @@
 
 def findConfig():
 	# do our best to find the correct configuration file
-	config_paths = [".", "~/.cspsim", "/etc/cspsim", "../Data"]
+	config_paths = [".", "~/.cspsim", "/etc/cspsim", os.path.join(os.path.dirname(__file__), "../Data")]
 
 	config = "CSPSim.ini"
 	for path in config_paths:
 		path = os.path.join(path, "CSPSim.ini")
 		path = os.path.expanduser(path)
 		if os.path.exists(path):
-			config = path
+			config = os.path.abspath(path)
 			break
 	return config