Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
Date: Wed, 27 Apr 2011 22:59:09
Message-Id: 16cca624a56e9f5032c83b88e9b58349ac87319f.zmedico@gentoo
1 commit: 16cca624a56e9f5032c83b88e9b58349ac87319f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 27 22:58:16 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 27 22:58:16 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=16cca624
7
8 emerge: add --help for 3 new options
9
10 ---
11 pym/_emerge/help.py | 20 ++++++++++++++++++++
12 1 files changed, 20 insertions(+), 0 deletions(-)
13
14 diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
15 index a120f54..ffc81e9 100644
16 --- a/pym/_emerge/help.py
17 +++ b/pym/_emerge/help.py
18 @@ -550,6 +550,12 @@ def help(myopts, havecolor=1):
19 print(" "+green("--nospinner"))
20 print(" Disables the spinner regardless of terminal type.")
21 print()
22 + print(" " + green("--nousepkg-atoms") + " " + turquoise("ATOMS"))
23 + desc = "A space separated list of package names or slot atoms." + \
24 + " Emerge will ignore matching binary packages."
25 + for line in wrap(desc, desc_width):
26 + print(desc_indent + line)
27 + print()
28 print(" "+green("--oneshot")+" ("+green("-1")+" short option)")
29 print(" Emerge as normal, but don't add packages to the world profile.")
30 print(" This package will only be updated if it is depended upon by")
31 @@ -627,6 +633,13 @@ def help(myopts, havecolor=1):
32 print(" not trigger reinstallation when flags that the user has not")
33 print(" enabled are added or removed.")
34 print()
35 + print(" " + green("--reinstall-atoms") + " " + turquoise("ATOMS"))
36 + desc = "A space separated list of package names or slot atoms. " + \
37 + "Emerge will treat matching packages as if they are not " + \
38 + "installed, and reinstall them if necessary."
39 + for line in wrap(desc, desc_width):
40 + print(desc_indent + line)
41 + print()
42 print(" "+green("--root=DIR"))
43 desc = "Set the ROOT environment variable " + \
44 "which is documented in the emerge(1) man page."
45 @@ -709,6 +722,13 @@ def help(myopts, havecolor=1):
46 for line in wrap(desc, desc_width):
47 print(desc_indent + line)
48 print()
49 + print(" " + green("--useoldpkg-atoms") + " " + turquoise("ATOMS"))
50 + desc = "A space separated list of package names or slot atoms." + \
51 + " Emerge will prefer matching binary packages over newer" + \
52 + " unbuilt packages."
53 + for line in wrap(desc, desc_width):
54 + print(desc_indent + line)
55 + print()
56 print(" " + green("--usepkg") + \
57 " [ %s | %s ] (%s short option)" % \
58 (turquoise("y"), turquoise("n"), green("-k")))