From 5f32c4bf10301d154aa35aaf5653afeadcd520d6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 4 Jul 2009 06:13:04 +0000 Subject: Remove the --avoid-update option and make it the default behavior when --update is not specified, as suggested by Allen Brooker (AllenJB) in bug #275945, comment #2. svn path=/main/trunk/; revision=13772 --- pym/_emerge/depgraph.py | 2 +- pym/_emerge/help.py | 11 ----------- pym/_emerge/main.py | 6 ------ 3 files changed, 1 insertion(+), 18 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 17e9c5f8d..9d415c7e1 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2007,7 +2007,7 @@ class depgraph(object): selective = "selective" in self._dynamic_config.myparams reinstall = False noreplace = "--noreplace" in self._frozen_config.myopts - avoid_update = "--avoid-update" in self._frozen_config.myopts + avoid_update = "--update" not in self._frozen_config.myopts # Behavior of the "selective" parameter depends on # whether or not a package matches an argument atom. # If an installed package provides an old-style 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" + \ 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 -- cgit v1.2.3-1-g7c22