diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-19 01:36:58 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-19 01:36:58 -0700 |
| commit | 72f83d8078da7aab7be9236b86be1526c15a4185 (patch) | |
| tree | 26f6344413472b07e4e2e08f349b19941dd6b0a4 /pym/_emerge/help.py | |
| parent | 092803df76a6112279b06f05f75a95b3285a97ea (diff) | |
| download | portage-72f83d8078da7aab7be9236b86be1526c15a4185.tar.gz portage-72f83d8078da7aab7be9236b86be1526c15a4185.tar.bz2 portage-72f83d8078da7aab7be9236b86be1526c15a4185.zip | |
Make emerge --noreplace identical to --selective.
This removes a very subtle difference in --noreplace package selection
logic which is not very useful and triggers strange package selection
choices in some cases, as reported in bug #375571.
Diffstat (limited to 'pym/_emerge/help.py')
| -rw-r--r-- | pym/_emerge/help.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 5b5658d9f..c978ce255 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -565,12 +565,6 @@ def help(myopts, havecolor=1): print(" ebuilds, or deps you specify on the command-line *will* cause") print(" Portage to remerge the package, even if it is already installed.") print(" Note that Portage won't remerge dependencies by default.") - desc = "Also note that this option takes " + \ - "precedence over options such as --newuse, preventing a package " + \ - "from being reinstalled even though the corresponding USE flag settings " + \ - "may have changed." - for line in wrap(desc, desc_width): - print(desc_indent + line) print() print(" "+green("--nospinner")) print(" Disables the spinner regardless of terminal type.") @@ -733,8 +727,7 @@ def help(myopts, havecolor=1): print() print(" " + green("--selective") + " [ %s | %s ]" % \ (turquoise("y"), turquoise("n"))) - desc = "This is similar to the --noreplace option, except that it " + \ - "does not take precedence over options such as --newuse. " + \ + desc = "This identical to the --noreplace option. " + \ "Some options, such as --update, imply --selective. " + \ "Use --selective=n if you want to forcefully disable " + \ "--selective, regardless of options like --update." |