diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-11-06 09:26:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-11-06 09:26:55 +0000 |
| commit | 541f404bacdbc2181510e0abb5baf86e0d3cb7ab (patch) | |
| tree | 3cb4bcca81586d77b077f3e504f89fd9ccf9111b /bin | |
| parent | 72f9356bc228777d3316a93c8976e709aa0874e2 (diff) | |
| download | portage-541f404bacdbc2181510e0abb5baf86e0d3cb7ab.tar.gz portage-541f404bacdbc2181510e0abb5baf86e0d3cb7ab.tar.bz2 portage-541f404bacdbc2181510e0abb5baf86e0d3cb7ab.zip | |
Remove "update portage before proceeding" message that is no longer relevant.
svn path=/main/trunk/; revision=4950
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 7 |
1 files changed, 1 insertions, 6 deletions
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.")) |