core (constants): use realpath instead of abspath + do not import it when building libervia

This commit is contained in:
souliane 2014-05-01 11:14:25 +02:00
commit 86d90d66aa

View file

@ -17,11 +17,11 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from os.path import expanduser, abspath
try:
import __pyjamas__ # do not import xdg when building Libervia
BaseDirectory = None
except ImportError:
from os.path import expanduser, realpath
from xdg import BaseDirectory
@ -62,7 +62,7 @@ class Const(object):
}
# List of the configuration filenames sorted by ascending priority
CONFIG_FILES = [abspath(expanduser(path) + APP_NAME_FILE + '.conf') for path in
CONFIG_FILES = [realpath(expanduser(path) + APP_NAME_FILE + '.conf') for path in
['/etc/', '~/', '~/.', '', '.'] +
['%s/' % path for path in list(BaseDirectory.load_config_paths(APP_NAME_FILE))]
]