diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-09-01 15:42:45 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-09-01 15:42:45 -0700 |
commit | ca755a56b628c8296630c3e435425b14d3b8bf10 (patch) | |
tree | 09f6899bc8d416a646b04133f2edfd98144d67ed /pym | |
parent | bb3094fb926910594f26ac3cf246d9aa9f9444d9 (diff) | |
download | portage-ca755a56b628c8296630c3e435425b14d3b8bf10.tar.gz portage-ca755a56b628c8296630c3e435425b14d3b8bf10.tar.bz2 portage-ca755a56b628c8296630c3e435425b14d3b8bf10.zip |
Eliminate bin/ebuild-helpers/4 directory.
Instead, just use conditionals where appropriate inside
bin/ebuild-helpers/* scripts.
Diffstat (limited to 'pym')
-rw-r--r-- | pym/portage/package/ebuild/_config/special_env_vars.py | 1 | ||||
-rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py index 4d425375f..1bcbbf7ef 100644 --- a/pym/portage/package/ebuild/_config/special_env_vars.py +++ b/pym/portage/package/ebuild/_config/special_env_vars.py @@ -170,6 +170,7 @@ environ_filter += [ "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTPS", "RESUMECOMMAND_RSYNC", "RESUMECOMMAND_SFTP", "SYNC", "UNINSTALL_IGNORE", "USE_EXPAND_HIDDEN", "USE_ORDER", + "__PORTAGE_HELPER" ] environ_filter = frozenset(environ_filter) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 9b678f7fb..9ca684edf 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -155,9 +155,6 @@ def _doebuild_path(settings, eapi=None): path = [] - if eapi not in (None, "0", "1", "2", "3"): - path.append(os.path.join(portage_bin_path, "ebuild-helpers", "4")) - path.append(os.path.join(portage_bin_path, "ebuild-helpers")) path.extend(prerootpath) |