diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-09 22:13:29 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-09 22:13:29 -0800 |
| commit | b8a22d672a309976fcdc856269921a32414fdac5 (patch) | |
| tree | 2ad6153d4e67a2c4c347e6bf06a8e10fbeb05fbd /pym/portage | |
| parent | 11a7448f1d5a0bfb38f8de9d66a8fa8d7118c877 (diff) | |
| download | portage-b8a22d672a309976fcdc856269921a32414fdac5.tar.gz portage-b8a22d672a309976fcdc856269921a32414fdac5.tar.bz2 portage-b8a22d672a309976fcdc856269921a32414fdac5.zip | |
config: make eprefix constructor parameter public
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/__init__.py | 4 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 10 | ||||
| -rw-r--r-- | pym/portage/tests/dbapi/test_fakedbapi.py | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index bdfb4e29d..5a1866ff1 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -508,7 +508,7 @@ def create_trees(config_root=None, target_root=None, trees=None, env=None): if eprefix is None: eprefix = portage.const.EPREFIX settings = config(config_root=config_root, target_root=target_root, - env=env, _eprefix=eprefix) + env=env, eprefix=eprefix) settings.lock() trees._target_eroot = settings['EROOT'] @@ -528,7 +528,7 @@ def create_trees(config_root=None, target_root=None, trees=None, env=None): if v is not None: clean_env[k] = v settings = config(config_root=None, target_root="/", - env=clean_env, _eprefix=eprefix) + env=clean_env, eprefix=eprefix) settings.lock() trees._running_eroot = settings['EROOT'] myroots.append((settings['EROOT'], settings)) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 40a61a43a..87cefee61 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -143,7 +143,7 @@ class config(object): def __init__(self, clone=None, mycpv=None, config_profile_path=None, config_incrementals=None, config_root=None, target_root=None, - _eprefix=portage.const.EPREFIX, local_config=True, env=None, + eprefix=portage.const.EPREFIX, local_config=True, env=None, _unmatched_removal=False): """ @param clone: If provided, init will use deepcopy to copy by value the instance. @@ -160,8 +160,8 @@ class config(object): @type config_root: String @param target_root: __init__ override of $ROOT env variable. @type target_root: String - @param _eprefix: set the EPREFIX variable (private, used by internal tests) - @type _eprefix: String + @param eprefix: set the EPREFIX variable + @type eprefix: String @param local_config: Enables loading of local config (/etc/portage); used most by repoman to ignore local config (keywording and unmasking) @type local_config: Boolean @@ -173,10 +173,6 @@ class config(object): @type _unmatched_removal: Boolean """ - # rename local _eprefix variable for convenience - eprefix = _eprefix - del _eprefix - # When initializing the global portage.settings instance, avoid # raising exceptions whenever possible since exceptions thrown # from 'import portage' or 'import portage.exceptions' statements diff --git a/pym/portage/tests/dbapi/test_fakedbapi.py b/pym/portage/tests/dbapi/test_fakedbapi.py index a2c5f778e..cfef94e26 100644 --- a/pym/portage/tests/dbapi/test_fakedbapi.py +++ b/pym/portage/tests/dbapi/test_fakedbapi.py @@ -48,7 +48,7 @@ class TestFakedbapi(TestCase): "PORTDIR": portdir, } fakedb = fakedbapi(settings=config(config_profile_path="", - env=env, _eprefix=tempdir)) + env=env, eprefix=tempdir)) for cpv, metadata in packages: fakedb.cpv_inject(cpv, metadata=metadata) |