From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 15 Sep 2007 17:32:05 +0000 (-0000)
Subject: Revert the workaround for bug #192341 since it will be much cleaner if we fall back... 
X-Git-Tag: v2.2_pre1~797
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37fbb95bf02ccd6c55ca715d18ecacb922a6ceec;p=portage.git

Revert the workaround for bug #192341 since it will be much cleaner if we fall back to spawning the chflags command when the freebsd module is unavailable.

svn path=/main/trunk/; revision=7785
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index ca322a8f2..b09e20537 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -6106,43 +6106,6 @@ def validate_ebuild_environment(trees):
 			print >> sys.stderr, bad("\a!!! Is the symlink correct? " + \
 				"Is your portage tree complete?\n")
 			sys.exit(9)
-		if myroot == "/" and \
-			portage.data.ostype == "FreeBSD":
-			ignore_missing = "ignore-missing-freebsd-module"
-			msg = None
-			die = False
-			if portage.bsd_chflags is not None and \
-				ignore_missing in mysettings.features:
-				msg = \
-				"Do NOT forget to remove \"%s\" " % ignore_missing + \
-				"from FEATURES as soon as " + \
-				"the freebsd python module has been properly " + \
-				"installed."
-			elif portage.bsd_chflags is None and \
-				ignore_missing not in mysettings.features:
-				die = True
-				msg = \
-				"An error occurred while attempting to import the " + \
-				"freebsd python module. This usually means that " + \
-				"python has just been upgraded and the py-freebsd " + \
-				"package has not yet been rebuilt by python-updater. " + \
-				"The freebsd python module is required for proper " + \
-				"operation. Please install or rebuild py-freebsd as " + \
-				"soon as possible. In order to bypass this error, " + \
-				"add \"%s\" to FEATURES. " % ignore_missing + \
-				"Do NOT forget to remove it from FEATURES as soon as " + \
-				"the freebsd python module has been properly " + \
-				"installed."
-			if msg:
-				width = 72 # leave room for the " * " prefix
-				from textwrap import wrap
-				for line in wrap(msg, width):
-					sys.stderr.write(bad(" * "))
-					sys.stderr.write(line)
-					sys.stderr.write("\n")
-				sys.stderr.flush()
-			if die:
-				sys.exit(9)
 		del myroot, mysettings
 
 def load_emerge_config(trees=None):