deprecate 'emerge action' syntax in favor of 'emerge --action'

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

diff --git a/bin/emerge b/bin/emerge
index e0be7e05e433f638bc2bd10cf812131cec1c204f..e3636654debc3da42d547713d21610e362af200d 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -271,8 +271,7 @@ for x in cmdline:
                        sys.exit(1)
        elif (not myaction) and (x in actions):
                if x not in ["system", "world"]:
-                       #print red("*** Deprecated use of action '"+x+"'")
-                       pass
+                       print red("*** Deprecated use of action '%s', use '--%s' instead" % (x,x))
                if myaction:
                        print
                        print red("!!!")+green(" Multiple actions requested... Please choose one only.")

diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index 322c5f951eb2ad1c50feded2d8fd8f8b9d6fb010..28a78a126ed6a583b785656a7b3c83d71f9a0a64 100644 (file)
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -14,7 +14,7 @@ def shorthelp():
        print "   "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >"
        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 "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("config")+" | "+green("--sync")+" ] "
        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")+" ]"