diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-18 21:55:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-18 21:55:44 +0000 |
| commit | f100a07ff12076a5b6d781ec47ff515d29510b4f (patch) | |
| tree | 839da632821bb936893bcb90d0d6b3846e0af037 /pym | |
| parent | a891ec595a09ff14366b7ca13b24a340ed44f10b (diff) | |
| download | portage-f100a07ff12076a5b6d781ec47ff515d29510b4f.tar.gz portage-f100a07ff12076a5b6d781ec47ff515d29510b4f.tar.bz2 portage-f100a07ff12076a5b6d781ec47ff515d29510b4f.zip | |
For bug #166880, always display the merge list (allowing --tree to be obeyed in any case).
svn path=/main/trunk/; revision=5998
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/emerge/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 6d3993266..c867f06b2 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -4734,7 +4734,7 @@ def action_build(settings, trees, mtimedb, sys.stderr.write("\nThese are required by '--usepkgonly' -- Terminating.\n\n") sys.exit(1) - if "--ask" in myopts: + if "--pretend" not in myopts: if "--resume" in myopts: validate_merge_list(trees, mtimedb["resume"]["mergelist"]) mymergelist = mtimedb["resume"]["mergelist"] @@ -4777,13 +4777,13 @@ def action_build(settings, trees, mtimedb, else: prompt="Would you like to merge these packages?" print - if userquery(prompt)=="No": + if "--ask" in myopts and userquery(prompt) == "No": print print "Quitting." print sys.exit(0) # Don't ask again (e.g. when auto-cleaning packages after merge) - del myopts["--ask"] + myopts.pop("--ask", None) if ("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts): if ("--resume" in myopts): |