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 729668fb227459a4d5c7be238bd4cae20aec3a60..1b7d0681acc64a535346e92da74bff59f7d173bc 100755 (executable)
--- 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."))