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/main.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/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 697647fdd..51357bde2 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -65,7 +65,6 @@ options=[ "--searchdesc", "--selective", "--skipfirst", "--tree", -"--avoid-update", "--update", "--usepkg", "--usepkgonly", "--verbose", @@ -1058,11 +1057,6 @@ def emerge_main(): noiselevel=-1) return 1 - if "--avoid-update" in myopts and "--update" in myopts: - writemsg("!!! conflicting options given: " + \ - "--update and --avoid-update\n", noiselevel=-1) - return 1 - if settings.get("PORTAGE_DEBUG", "") == "1": spinner.update = spinner.update_quiet portage.debug=1 |