diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-24 00:57:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-24 00:57:51 +0000 |
| commit | 76b434da3e9e219443bd672237a74c4db9705162 (patch) | |
| tree | 396bfb5cad3b9f12dc3e5fdd0ef15e502f66108b /bin | |
| parent | 2d4240c952e9518701887ff4747ad290ae8ec738 (diff) | |
| download | portage-76b434da3e9e219443bd672237a74c4db9705162.tar.gz portage-76b434da3e9e219443bd672237a74c4db9705162.tar.bz2 portage-76b434da3e9e219443bd672237a74c4db9705162.zip | |
Allow --verbose to trigger a merge list even without --pretend, --ask, or --tree. Thanks to agaffney and zlin for the suggestion. (trunk r6065:6066)
svn path=/main/branches/2.1.2/; revision=6067
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 4193a9bff..b9a3fa6bf 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4620,7 +4620,8 @@ def action_build(settings, trees, mtimedb, ldpath_mtimes = mtimedb["ldpath"] favorites=[] if "--quiet" not in myopts and \ - ("--pretend" in myopts or "--ask" in myopts or "--tree" in myopts): + ("--pretend" in myopts or "--ask" in myopts or \ + "--tree" in myopts or "--verbose" in myopts): action = "" if "--fetchonly" in myopts or "--fetch-all-uri" in myopts: action = "fetched" @@ -4710,7 +4711,8 @@ def action_build(settings, trees, mtimedb, sys.exit(1) if "--pretend" not in myopts and \ - ("--ask" in myopts or "--tree" in myopts) and \ + ("--ask" in myopts or "--tree" in myopts or \ + "--verbose" in myopts) and \ not ("--quiet" in myopts and "--ask" not in myopts): if "--resume" in myopts: validate_merge_list(trees, mtimedb["resume"]["mergelist"]) |