diff options
Diffstat (limited to 'pym/_emerge/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index aff1d3733..d19b7950f 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -25,7 +25,6 @@ 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 @@ -468,6 +467,7 @@ def insert_optional_args(args): '--buildpkg' : y_or_n, '--complete-graph' : y_or_n, '--deep' : valid_integers, + '--depclean-lib-check' : y_or_n, '--deselect' : y_or_n, '--binpkg-respect-use' : y_or_n, '--fail-clean' : y_or_n, @@ -491,9 +491,6 @@ def insert_optional_args(args): '--usepkgonly' : y_or_n, } - if _ENABLE_DYN_LINK_MAP: - default_arg_opts['--depclean-lib-check'] = y_or_n - short_arg_opts = { 'D' : valid_integers, 'j' : valid_integers, @@ -728,6 +725,12 @@ def parse_opts(tmpcmdline, silent=False): "action" : "store" }, + "--depclean-lib-check": { + "help" : "check for consumers of libraries before removing them", + "type" : "choice", + "choices" : true_y_or_n + }, + "--deselect": { "help" : "remove atoms/sets from the world file", "type" : "choice", @@ -977,13 +980,6 @@ 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_y_or_n - } - from optparse import OptionParser parser = OptionParser() if parser.has_option("--help"): @@ -1058,9 +1054,8 @@ def parse_opts(tmpcmdline, silent=False): else: myoptions.complete_graph = None - if _ENABLE_DYN_LINK_MAP: - if myoptions.depclean_lib_check in true_y: - myoptions.depclean_lib_check = True + if myoptions.depclean_lib_check in true_y: + myoptions.depclean_lib_check = True if myoptions.exclude: bad_atoms = _find_bad_atoms(myoptions.exclude) |