diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-01 16:08:16 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-01 16:08:16 -0700 |
| commit | 0c89363dfe8afd98e67b8916ae8233904026493f (patch) | |
| tree | 652a5554133bf9cf380ed29e063c3cb4fa429270 | |
| parent | 0b657f683f8498de59cf254dfb016bf313930b1d (diff) | |
| download | portage-0c89363dfe8afd98e67b8916ae8233904026493f.tar.gz portage-0c89363dfe8afd98e67b8916ae8233904026493f.tar.bz2 portage-0c89363dfe8afd98e67b8916ae8233904026493f.zip | |
ebuild-helpers/sed: move to bsd subdirectory
This helps to prevent inappropriate use of the sed wrapper on GNU
systems, which commonly occurs when users install portage manually
during recovery situations.
| -rwxr-xr-x | bin/ebuild-helpers/bsd/sed (renamed from bin/ebuild-helpers/sed) | 0 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/bin/ebuild-helpers/sed b/bin/ebuild-helpers/bsd/sed index cc447696d..cc447696d 100755 --- a/bin/ebuild-helpers/sed +++ b/bin/ebuild-helpers/bsd/sed diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 9ca684edf..3dedfd4bf 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -155,6 +155,9 @@ def _doebuild_path(settings, eapi=None): path = [] + if settings.get("USERLAND", "GNU") != "GNU": + path.append(os.path.join(portage_bin_path, "ebuild-helpers", "bsd")) + path.append(os.path.join(portage_bin_path, "ebuild-helpers")) path.extend(prerootpath) |