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/depgraph.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/depgraph.py')
-rw-r--r-- | pym/_emerge/depgraph.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index a5923ddf6..9e3064d25 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3591,7 +3591,6 @@ class depgraph(object): empty = "empty" in self._dynamic_config.myparams selective = "selective" in self._dynamic_config.myparams reinstall = False - noreplace = "--noreplace" in self._frozen_config.myopts avoid_update = "--update" not in self._frozen_config.myopts dont_miss_updates = "--update" in self._frozen_config.myopts use_ebuild_visibility = self._frozen_config.myopts.get( @@ -3679,16 +3678,6 @@ class depgraph(object): continue cpv = pkg.cpv - # Make --noreplace take precedence over --newuse. - if not pkg.installed and noreplace and \ - cpv in vardb.match(atom): - inst_pkg = self._pkg(pkg.cpv, "installed", - root_config, installed=True) - if inst_pkg.visible: - # If the installed version is masked, it may - # be necessary to look at lower versions, - # in case there is a visible downgrade. - continue reinstall_for_flags = None if not pkg.installed or \ |