commit: f8132d4a8c8bf44ed90bef88c35eb9565e6a4a4d Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> AuthorDate: Sun Jun 1 22:23:50 2014 +0000 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> CommitDate: Thu Jun 12 21:11:50 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=f8132d4a
config.py: moves EPREFIX constant to top of file --- layman/config.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/layman/config.py b/layman/config.py index 9d2bc7f..31dc0ac 100644 --- a/layman/config.py +++ b/layman/config.py @@ -27,7 +27,6 @@ from __future__ import unicode_literals __version__ = "0.2" - import sys import os @@ -41,6 +40,13 @@ except: from layman.output import Message from layman.utils import path +# establish the eprefix, initially set so eprefixify can +# set it on install +EPREFIX = "@GENTOO_PORTAGE_EPREFIX@" +# check and set it if it wasn't +if "GENTOO_PORTAGE_EPREFIX" in EPREFIX: + EPREFIX = '' + def read_layman_config(config=None, defaults=None, output=None): """reads the config file defined in defaults['config'] and updates the config @@ -66,14 +72,6 @@ def read_layman_config(config=None, defaults=None, output=None): overlays.update(["file://" + _path]) config.set('MAIN', 'overlays', '\n'.join(overlays)) -# establish the eprefix, initially set so eprefixify can -# set it on install -EPREFIX = "@GENTOO_PORTAGE_EPREFIX@" - -# check and set it if it wasn't -if "GENTOO_PORTAGE_EPREFIX" in EPREFIX: - EPREFIX = '' - class BareConfig(object): '''Handles the configuration only.'''