finally remove --upgradeonly

svn path=/main/trunk/; revision=2739

diff --git a/bin/emerge b/bin/emerge
index c423aede388d8ce115dc96ff5275dedee49c1fae..09a1dfd7a79568b03cf4354555f4f452ca65c8dc 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -192,7 +192,7 @@ options=[
 "--searchdesc",   "--selective",
 "--skipfirst",    "--skip-first",
 "--tree",
-"--update",       "--upgradeonly",
+"--update",       
 "--usepkg",       "--usepkgonly",
 "--verbose",      "--version"
 ]
@@ -216,7 +216,7 @@ shortmapping={
 "q":"--quiet",
 "s":"--search",    "S":"--searchdesc",
 't':"--tree",
-"u":"--update",    "U":"--upgradeonly",
+"u":"--update",
 "v":"--verbose",   "V":"--version"
 }
 
@@ -383,17 +383,6 @@ if ("--newuse" in myopts) and not ("--update" in myopts):
        print ">>> --newuse implies --update... adding --update to options."
        myopts.append("--update")
 
-# Print deprecation warning for -U
-if ("--upgradeonly" in myopts):
-       print
-       print red("*** Warning: --upgradeonly is a deprecated option in portage-"+portage.VERSION)
-       print red("***          and will likely be removed in a future version.")
-       print
-       # Also allow -U to apply --update/-u
-       if not ("--update" in myopts):
-               print ">>> --upgradeonly implies --update... adding --update to options."
-               myopts.append("--update")
-
 # Also allow -l to apply --pretend/-p, but if already in --ask mode
 if ("--changelog" in myopts) and not (("--pretend" in myopts) or ("--ask" in myopts)):
        print ">>> --changelog implies --pretend... adding --pretend to options."
@@ -1329,26 +1318,6 @@ class depgraph:
                                        else:
                                                myeb_pkg = None
 
-                               if "--upgradeonly" in myopts:
-                                       # Check that there isn't a newer version of this package already installed
-                                       cand = None
-                                       try:
-                                               # XXX: This can throw an exception if the ebuild doesn't exist
-                                               if myeb:
-                                                       cand=self.is_newer_ver_installed(myroot,x,myeb)
-                                               elif myeb_pkg:
-                                                       cand=self.is_newer_ver_installed(myroot,x,myeb_pkg)
-                                       except SystemExit, e:
-                                               raise # Needed else can't exit
-                                       except Exception, e:
-                                               print "Warning: "+str(e)
-                                       if cand:
-                                               # --newuse can't work because the installed version isn't available
-                                               # just pretend like the package doesn't matter
-                                               # XXX: hidden assumption here that the higher versioned package
-                                               # satisfies the atom that was given
-                                               continue
-
                                if myeb:
                                        myk=["ebuild",myroot,myeb]
                                elif myeb_pkg:

diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index 9a80de50d24f66748fad48d1d8c472d791e4b11c..2cab41195a04163425cbefd25b9bab3f32c622d5 100644 (file)
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -15,7 +15,7 @@ def shorthelp():
        print "   "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >"
        print "   "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]"
        print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("config")+" | "+green("sync")+" ] "
-       print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnNoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
+       print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnNoOpPsSuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
        print      "                                    ["+green("--columns")+"] ["+green("--nospinner")+"]"
        print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
        print