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/actions.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/actions.py')
| -rw-r--r-- | pym/_emerge/actions.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index f6c2721fa..219ed7101 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -163,6 +163,8 @@ def action_build(settings, trees, mtimedb, debug = "--debug" in myopts verbose = "--verbose" in myopts quiet = "--quiet" in myopts + myparams = create_depgraph_params(myopts, myaction) + if pretend or fetchonly: # make the mtimedb readonly mtimedb.filename = None @@ -187,7 +189,6 @@ def action_build(settings, trees, mtimedb, favorites = mtimedb["resume"].get("favorites") if not isinstance(favorites, list): favorites = [] - myparams = create_depgraph_params(myopts, myaction) resume_data = mtimedb["resume"] mergelist = resume_data["mergelist"] @@ -286,7 +287,6 @@ def action_build(settings, trees, mtimedb, print(darkgreen("emerge: It seems we have nothing to resume...")) return os.EX_OK - myparams = create_depgraph_params(myopts, myaction) try: success, mydepgraph, favorites = backtrack_depgraph( settings, trees, myopts, myparams, myaction, myfiles, spinner) @@ -331,7 +331,7 @@ def action_build(settings, trees, mtimedb, if mergecount==0: sets = trees[settings["ROOT"]]["root_config"].sets world_candidates = None - if "--noreplace" in myopts and \ + if "selective" in myparams and \ not oneshot and favorites: # Sets that are not world candidates are filtered # out here since the favorites list needs to be @@ -340,7 +340,7 @@ def action_build(settings, trees, mtimedb, world_candidates = [x for x in favorites \ if not (x.startswith(SETPREFIX) and \ not sets[x[1:]].world_candidate)] - if "--noreplace" in myopts and \ + if "selective" in myparams and \ not oneshot and world_candidates: print() for x in world_candidates: |