sandbox: finish removal of macossandbox
authorFabian Groffen <grobian@gentoo.org>
Fri, 23 Dec 2011 11:04:02 +0000 (12:04 +0100)
committerFabian Groffen <grobian@gentoo.org>
Fri, 23 Dec 2011 11:04:02 +0000 (12:04 +0100)
pym/portage/package/ebuild/config.py

index 1d69f9d5032dad03962100cc9341cfc302183fc3..aea360005bc7dc161b7d2a63a0be01ee7c330756 100644 (file)
@@ -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 "