From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 6 Nov 2006 09:26:55 +0000 (-0000)
Subject: Remove "update portage before proceeding" message that is no longer relevant.
X-Git-Tag: v2.1.2~504
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=541f404bacdbc2181510e0abb5baf86e0d3cb7ab;p=portage.git

Remove "update portage before proceeding" message that is no longer relevant.

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

diff --git a/bin/emerge b/bin/emerge
index 729668fb2..1b7d0681a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2137,12 +2137,7 @@ class depgraph:
 					myversion = "%s-%s" % (mysplit[1], mysplit[2])
 
 				if myversion != portage.VERSION and "--quiet" not in self.myopts:
-					if "--emptytree" in self.myopts:
-						p.append(colorize("WARN", "***")+" Please update portage to the above version before proceeding.")
-						p.append("    Failure to do so may result in failed or improper merges.")
-						p.append("    A simple '"+green("emerge portage")+"' is sufficient.")
-						p.append("")
-					elif mylist.index(x) < len(mylist) - 1 and \
+					if mylist.index(x) < len(mylist) - 1 and \
 						"livecvsportage" not in self.settings.features:
 						p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,"))
 						p.append(colorize("WARN", "    then resume the merge."))