| 1 |
commit: 0c89363dfe8afd98e67b8916ae8233904026493f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 1 23:08:16 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 1 23:08:16 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0c89363d |
| 7 |
|
| 8 |
ebuild-helpers/sed: move to bsd subdirectory |
| 9 |
|
| 10 |
This helps to prevent inappropriate use of the sed wrapper on GNU |
| 11 |
systems, which commonly occurs when users install portage manually |
| 12 |
during recovery situations. |
| 13 |
|
| 14 |
--- |
| 15 |
bin/ebuild-helpers/{ => bsd}/sed | 0 |
| 16 |
pym/portage/package/ebuild/doebuild.py | 3 +++ |
| 17 |
2 files changed, 3 insertions(+), 0 deletions(-) |
| 18 |
|
| 19 |
diff --git a/bin/ebuild-helpers/sed b/bin/ebuild-helpers/bsd/sed |
| 20 |
similarity index 100% |
| 21 |
rename from bin/ebuild-helpers/sed |
| 22 |
rename to bin/ebuild-helpers/bsd/sed |
| 23 |
|
| 24 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 25 |
index 9ca684e..3dedfd4 100644 |
| 26 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 27 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 28 |
@@ -155,6 +155,9 @@ def _doebuild_path(settings, eapi=None): |
| 29 |
|
| 30 |
path = [] |
| 31 |
|
| 32 |
+ if settings.get("USERLAND", "GNU") != "GNU": |
| 33 |
+ path.append(os.path.join(portage_bin_path, "ebuild-helpers", "bsd")) |
| 34 |
+ |
| 35 |
path.append(os.path.join(portage_bin_path, "ebuild-helpers")) |
| 36 |
path.extend(prerootpath) |
Archives