diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-07-04 06:13:04 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-07-04 06:13:04 +0000 |
commit | 5f32c4bf10301d154aa35aaf5653afeadcd520d6 (patch) | |
tree | d8a1a2e6ee7f2b468ec838e772d753545046b802 /pym/_emerge/help.py | |
parent | 9d9610e37d147b89a31e3d635016cf98c77e7143 (diff) | |
download | portage-5f32c4bf10301d154aa35aaf5653afeadcd520d6.tar.gz portage-5f32c4bf10301d154aa35aaf5653afeadcd520d6.tar.bz2 portage-5f32c4bf10301d154aa35aaf5653afeadcd520d6.zip |
Remove the --avoid-update option and make it the default behavior when
--update is not specified, as suggested by Allen Brooker (AllenJB)
<gentoo-bugs@allenjb.me.uk> in bug #275945, comment #2.
svn path=/main/trunk/; revision=13772
Diffstat (limited to 'pym/_emerge/help.py')
-rw-r--r-- | pym/_emerge/help.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 291dd26f2..b39bf48bf 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -249,17 +249,6 @@ def help(myopts, havecolor=1): print " to the prompt, so an accidental press of the \"Enter\" key at any" print " time prior to the prompt will be interpreted as a choice!" print - print " "+green("--avoid-update") - desc = "Tries to prevent package updates. This may not always be" + \ - " possible since new packages or new dependencies due to USE" + \ - " flag changes may require a newer version of an installed" + \ - " package. Furthermore, this option may lead to slot conflicts" + \ - " (Multiple package instances within a single package slot" + \ - " have been pulled into the dependency graph). It is not" + \ - " possible to use this option in such a case." - for line in wrap(desc, desc_width): - print desc_indent + line - print print " "+green("--buildpkg")+" ("+green("-b")+" short option)" desc = "Tells emerge to build binary packages for all ebuilds processed in" + \ " addition to actually merging the packages. Useful for maintainers" + \ |