[Greater-commits] r3761 - in branches/3.0.0-all-models/GREAT-ER: . Greater/Modules

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2011-08-01 12:57:23 +0200 (Mon, 01 Aug 2011)
New Revision: 3761

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py
Log:
Merged revisions 3760 via svnmerge from 
svn+ssh://bricks@svn.wald.intevation.org/greater/trunk/GREAT-ER

........
  r3760 | bricks | 2011-08-01 12:45:24 +0200 (Mo, 01 Aug 2011) | 2 lines
  
  ~ path is not regognized in python. It must be expanded.
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-448,450-3712
   + /trunk/GREAT-ER:1-448,450-3712,3760

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py	2011-08-01 10:45:24 UTC (rev 3760)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py	2011-08-01 10:57:23 UTC (rev 3761)
@@ -326,7 +326,7 @@
         if wxPlatform == '__WXMSW__':
             logdir = os.path.join(winpaths.get_appdata(), "greater")
         else:
-            logdir = os.path.join("~", ".greater")
+            logdir = os.path.join(os.path.expanduser("~"), ".greater")
 
         if not os.path.isdir(logdir):
             os.mkdir(logdir)