From 5a6769d63c2706de4398f5e2fcba6a1fb4a9f298 Mon Sep 17 00:00:00 2001 From: Michael Wild Date: Sat, 31 Dec 2011 14:17:48 +0100 Subject: [PATCH] FIX: Mistake commiting bin/freefoam-log.py.in Fixes 60a32090e93a37e5f8d6738401f3942e85482e8e. Signed-off-by: Michael Wild --- bin/freefoam-log.py.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/freefoam-log.py.in b/bin/freefoam-log.py.in index 75423c5bc..46cbd8dd9 100755 --- a/bin/freefoam-log.py.in +++ b/bin/freefoam-log.py.in @@ -74,7 +74,8 @@ The query database is a simple text format containing Python regular expressions. The regular expression must capture the queried value in a group with the values name (i.e. using (?P...) syntax). Lines where the first non-blank character is a # will be ignored. The database will either be -$HOME/.FreeFOAM/foamLog.db or if not found @FOAM_DATA_DIR@/foamLog.db. +/foamLog.db, $HOME/.FreeFOAM/foamLog.db or +@FOAM_DATA_DIR@/foamLog.db, whichever is found first. Option -s suppresses the default information and only prints the extracted variables. @@ -230,10 +231,11 @@ if not os.path.isfile(logName): # find foamLog.db dbName = None -for n in [ +for n in ( + caseDir, os.path.expanduser('~/.FreeFOAM'), os.path.normpath('@FOAM_DATA_DIR@') - ]: + ): n = os.path.join(os.path.normpath(n), 'foamLog.db') if os.path.isfile(n): dbName = n -- 2.11.4.GIT