summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-07 18:48:41 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-07 18:48:41 -0700
commit7102ca56a6c492e4dfc7b984e031955b1e97ed21 (patch)
tree6de4bab73546b32a4cc9fe82c572490baebde406
parentb7e91fab9e107c69729298f21e137c22713f8527 (diff)
downloadportage-7102ca56a6c492e4dfc7b984e031955b1e97ed21.tar.gz
portage-7102ca56a6c492e4dfc7b984e031955b1e97ed21.tar.bz2
portage-7102ca56a6c492e4dfc7b984e031955b1e97ed21.zip
Disable the --depclean-lib-check option when _ENABLE_DYN_LINK_MAP
is False.
-rw-r--r--pym/_emerge/help.py19
-rw-r--r--pym/_emerge/main.py18
2 files changed, 22 insertions, 15 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 371e00da2..0a4241d37 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -395,15 +395,18 @@ def help(myopts, havecolor=1):
print(" that are not directly listed in the dependencies of a package.")
print(" Also see --with-bdeps for behavior with respect to build time")
print(" dependencies that are not strictly required.")
- print()
- print(" " + green("--depclean-lib-check") + "[=%s]" % turquoise("n"))
- desc = "Account for library link-level dependencies during " + \
- "--depclean and --prune actions. This " + \
- "option is enabled by default. In some cases this can " + \
- "be somewhat time-consuming."
- for line in wrap(desc, desc_width):
- print(desc_indent + line)
print()
+
+ if _ENABLE_DYN_LINK_MAP:
+ print(" " + green("--depclean-lib-check") + "[=%s]" % turquoise("n"))
+ desc = "Account for library link-level dependencies during " + \
+ "--depclean and --prune actions. This " + \
+ "option is enabled by default. In some cases this can " + \
+ "be somewhat time-consuming."
+ for line in wrap(desc, desc_width):
+ print(desc_indent + line)
+ print()
+
print(" "+green("--emptytree")+" ("+green("-e")+" short option)")
desc = "Reinstalls target atoms and their entire deep " + \
"dependency tree, as though no packages are currently " + \
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 64733ceaa..062d79dad 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -24,6 +24,7 @@ from portage.output import create_color_func
good = create_color_func("GOOD")
bad = create_color_func("BAD")
+from portage.const import _ENABLE_DYN_LINK_MAP
import portage.elog
import portage.util
import portage.locks
@@ -396,7 +397,6 @@ def insert_optional_args(args):
'--autounmask' : ('n',),
'--complete-graph' : ('n',),
'--deep' : valid_integers,
- '--depclean-lib-check' : ('n',),
'--deselect' : ('n',),
'--binpkg-respect-use' : ('n', 'y',),
'--fail-clean' : ('n',),
@@ -414,6 +414,9 @@ def insert_optional_args(args):
'--usepkgonly' : ('n',),
}
+ if _ENABLE_DYN_LINK_MAP:
+ default_arg_opts['--depclean-lib-check'] = ('n',)
+
short_arg_opts = {
'D' : valid_integers,
'j' : valid_integers,
@@ -569,12 +572,6 @@ def parse_opts(tmpcmdline, silent=False):
"action" : "store"
},
- "--depclean-lib-check": {
- "help" : "check for consumers of libraries before removing them",
- "type" : "choice",
- "choices" : ("True", "n")
- },
-
"--deselect": {
"help" : "remove atoms/sets from the world file",
"type" : "choice",
@@ -718,6 +715,13 @@ def parse_opts(tmpcmdline, silent=False):
}
+ if _ENABLE_DYN_LINK_MAP:
+ argument_options["--depclean-lib-check"] = {
+ "help" : "check for consumers of libraries before removing them",
+ "type" : "choice",
+ "choices" : ("True", "n")
+ }
+
from optparse import OptionParser
parser = OptionParser()
if parser.has_option("--help"):