diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-08-29 13:23:22 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-29 13:23:22 -0700 |
| commit | 78ba7f0d3a3a2defdf9807ef2e8138965490a2fc (patch) | |
| tree | 10a549acf3569d3104291e38927cd8318318da09 /pym/_emerge/main.py | |
| parent | 9f14ed80e65a18da06e0834961ea032e3e830319 (diff) | |
| download | portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.tar.gz portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.tar.bz2 portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.zip | |
Rename slot-abi stuff to refer to slot-operator.
This makes it consistent with the language in the PMS eapi-5 branch:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=5d6749ac9e5ddc5b1daaad7737b65fa81c6ece47
Diffstat (limited to 'pym/_emerge/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index d4b2901e3..049c3ec88 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -478,7 +478,7 @@ def insert_optional_args(args): '--package-moves' : y_or_n, '--quiet' : y_or_n, '--quiet-build' : y_or_n, - '--rebuild-if-new-slot-abi': y_or_n, + '--rebuild-if-new-slot': y_or_n, '--rebuild-if-new-rev' : y_or_n, '--rebuild-if-new-ver' : y_or_n, '--rebuild-if-unbuilt' : y_or_n, @@ -754,11 +754,11 @@ def parse_opts(tmpcmdline, silent=False): "choices" : true_y_or_n }, - "--ignore-built-slot-abi-deps": { - "help": "Ignore the SLOT/ABI := operator parts of dependencies that have " + "--ignore-built-slot-operator-deps": { + "help": "Ignore the slot/sub-slot := operator parts of dependencies that have " "been recorded when packages where built. This option is intended " "only for debugging purposes, and it only affects built packages " - "that specify SLOT/ABI := operator dependencies using the " + "that specify slot/sub-slot := operator dependencies using the " "experimental \"4-slot-abi\" EAPI.", "type": "choice", "choices": y_or_n @@ -877,8 +877,8 @@ def parse_opts(tmpcmdline, silent=False): "choices" : true_y_or_n, }, - "--rebuild-if-new-slot-abi": { - "help" : ("Automatically rebuild or reinstall packages when SLOT/ABI := " + "--rebuild-if-new-slot": { + "help" : ("Automatically rebuild or reinstall packages when slot/sub-slot := " "operator dependencies can be satisfied by a newer slot, so that " "older packages slots will become eligible for removal by the " "--depclean action as soon as possible."), @@ -1127,8 +1127,8 @@ def parse_opts(tmpcmdline, silent=False): if myoptions.quiet_build in true_y: myoptions.quiet_build = 'y' - if myoptions.rebuild_if_new_slot_abi in true_y: - myoptions.rebuild_if_new_slot_abi = 'y' + if myoptions.rebuild_if_new_slot in true_y: + myoptions.rebuild_if_new_slot = 'y' if myoptions.rebuild_if_new_ver in true_y: myoptions.rebuild_if_new_ver = True |