diff options
| -rw-r--r-- | man/emerge.1 | 12 | ||||
| -rw-r--r-- | pym/_emerge/depgraph.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 11 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 6 |
4 files changed, 1 insertions, 30 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index a1dbcde73..df054c9e9 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -90,15 +90,6 @@ option if you want to install a tbz2\fR. The packages are added to the \fBworld\fR file at the end, so that they are considered for later updating. .TP -.BR "\-\-avoid\-update " -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. -.TP .BR "\-\-clean " (\fB\-c\fR) Cleans up the system by examining the installed packages and removing older packages. This is accomplished by looking at each installed package and separating @@ -373,9 +364,6 @@ A USE flag was turned off for a package. USE flags may be toggled by your profile as well as your USE and package.use settings. - -\fB\-\-avoid\-update\fR may prevent updates of installed packages without -use flag changes. Note that \fB\-\-avoid-\update\fR may lead to slot conflicts. .TP .BR "\-\-noconfmem" Causes portage to disregard merge records indicating that a config file 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 |