[patch] Remove spurious SELinux warnings.

portage-2.2-selinux.patch (text/plain), 1.80 KB, created by Michael Edenfield on 2008-07-25 18:50:38 UTC

--- __init__.py.orig	2008-07-25 14:34:09.000000000 -0400
+++ __init__.py	2008-07-25 14:49:11.000000000 -0400
@@ -2874,7 +2874,7 @@
 		return flatten([[myarch, "~" + myarch] \
 			for myarch in self["PORTAGE_ARCHLIST"].split()])
 
-	def selinux_enabled(self):
+	def selinux_enabled(self, warn=True):
 		if getattr(self, "_selinux_enabled", None) is None:
 			self._selinux_enabled = 0
 			if "selinux" in self["USE"].split():
@@ -2884,9 +2884,14 @@
 					else:
 						self._selinux_enabled = 0
 				else:
-					writemsg("!!! SELinux module not found. Please verify that it was installed.\n",
-						noiselevel=-1)
-					self._selinux_enabled = 0
+					if warn:
+						writemsg("!!! SELinux module not found. Please verify that it was installed.\n",
+							noiselevel=-1)
+						self._selinux_enabled = 0
+					else:
+						# We're just checking for SELinux, we don't actually 
+						# need it yet, so no need to warn that it's not loaded.
+						pass
 			if self._selinux_enabled == 0:
 				try:	
 					del sys.modules["selinux"]
@@ -4850,7 +4855,7 @@
 		# When sesandbox is enabled, only log if PORT_LOGDIR is explicitly
 		# enabled since it is possible that local SELinux security policies
 		# do not allow ouput to be piped out of the sesandbox domain.
-		if not (mysettings.selinux_enabled() and \
+		if not (mysettings.selinux_enabled(False) and \
 			"sesandbox" in mysettings.features):
 			mysettings["PORTAGE_LOG_FILE"] = os.path.join(
 				mysettings["T"], "build.log")
@@ -7198,7 +7203,7 @@
 	features    = settings.features
 	groups      = settings["ACCEPT_KEYWORDS"].split()
 	pkglines    = settings.packages
-	selinux_enabled   = settings.selinux_enabled()
+	selinux_enabled   = settings.selinux_enabled(False)
 	thirdpartymirrors = settings.thirdpartymirrors()
 	usedefaults       = settings.use_defs
 	profiledir  = None