| 1 |
commit: 1fab5e857885447ba381f44ece8d3f750bbe9b71 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 23 11:04:02 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 23 11:04:02 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1fab5e85 |
| 7 |
|
| 8 |
sandbox: finish removal of macossandbox |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/package/ebuild/config.py | 14 +------------- |
| 12 |
1 files changed, 1 insertions(+), 13 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 15 |
index 1d69f9d..aea3600 100644 |
| 16 |
--- a/pym/portage/package/ebuild/config.py |
| 17 |
+++ b/pym/portage/package/ebuild/config.py |
| 18 |
@@ -927,7 +927,7 @@ class config(object): |
| 19 |
writemsg("!!! /etc/portage/profile/virtuals. Please move it to\n") |
| 20 |
writemsg("!!! this new location.\n\n") |
| 21 |
|
| 22 |
- if not sandbox_capable and \ |
| 23 |
+ if not sandbox_capable and not macossandbox_capable and \ |
| 24 |
("sandbox" in self.features or "usersandbox" in self.features): |
| 25 |
if self.profile_path is not None and \ |
| 26 |
os.path.realpath(self.profile_path) == \ |
| 27 |
@@ -939,18 +939,6 @@ class config(object): |
| 28 |
writemsg(colorize("BAD", _("!!! Problem with sandbox" |
| 29 |
" binary. Disabling...\n\n")), noiselevel=-1) |
| 30 |
|
| 31 |
- if not macossandbox_capable and \ |
| 32 |
- ("macossandbox" in self.features or "macosusersandbox" in self.features): |
| 33 |
- if self.profile_path is not None and \ |
| 34 |
- os.path.realpath(self.profile_path) == \ |
| 35 |
- os.path.realpath(os.path.join( |
| 36 |
- self["PORTAGE_CONFIGROOT"], PROFILE_PATH)): |
| 37 |
- """ Don't show this warning when running repoman and the |
| 38 |
- sandbox feature came from a profile that doesn't belong to |
| 39 |
- the user.""" |
| 40 |
- writemsg(colorize("BAD", "!!! Problem with macos sandbox" + \ |
| 41 |
- " binary. Disabling...\n\n"), noiselevel=-1) |
| 42 |
- |
| 43 |
if "fakeroot" in self.features and \ |
| 44 |
not fakeroot_capable: |
| 45 |
writemsg(_("!!! FEATURES=fakeroot is enabled, but the " |
Archives