From 1fab5e857885447ba381f44ece8d3f750bbe9b71 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 23 Dec 2011 12:04:02 +0100 Subject: [PATCH] sandbox: finish removal of macossandbox --- pym/portage/package/ebuild/config.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 1d69f9d50..aea360005 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -927,7 +927,7 @@ class config(object): writemsg("!!! /etc/portage/profile/virtuals. Please move it to\n") writemsg("!!! this new location.\n\n") - if not sandbox_capable and \ + if not sandbox_capable and not macossandbox_capable and \ ("sandbox" in self.features or "usersandbox" in self.features): if self.profile_path is not None and \ os.path.realpath(self.profile_path) == \ @@ -939,18 +939,6 @@ class config(object): writemsg(colorize("BAD", _("!!! Problem with sandbox" " binary. Disabling...\n\n")), noiselevel=-1) - if not macossandbox_capable and \ - ("macossandbox" in self.features or "macosusersandbox" in self.features): - if self.profile_path is not None and \ - os.path.realpath(self.profile_path) == \ - os.path.realpath(os.path.join( - self["PORTAGE_CONFIGROOT"], PROFILE_PATH)): - """ Don't show this warning when running repoman and the - sandbox feature came from a profile that doesn't belong to - the user.""" - writemsg(colorize("BAD", "!!! Problem with macos sandbox" + \ - " binary. Disabling...\n\n"), noiselevel=-1) - if "fakeroot" in self.features and \ not fakeroot_capable: writemsg(_("!!! FEATURES=fakeroot is enabled, but the " -- 2.26.2