summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge3
-rw-r--r--pym/emergehelp.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge
index e0be7e05e..e3636654d 100755
--- 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 322c5f951..28a78a126 100644
--- 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")+" ]"