| 1 |
Hi, |
| 2 |
|
| 3 |
Ok, so it's more major than I originally intended but I think it's |
| 4 |
a good direction (once you get used to it). Roughly: |
| 5 |
|
| 6 |
1. All bash color vars are now prefixed with `PORTAGE_COLOR_` to avoid |
| 7 |
accidental collisions with ebuild vars (e.g. ebuild setting |
| 8 |
`GOOD=foo` broke `elog` before). |
| 9 |
2. There are specific color vars for all kinds of output functions, |
| 10 |
and now `einfo` messages use distinct color (dark green) from `elog`, |
| 11 |
and `eqawarn` (brown) from `ewarn`. |
| 12 |
3. Messages are now prefixed by their kind, making it possible to |
| 13 |
distinguish them without colors and grep for specific kind of logs: |
| 14 |
- `[--]` for einfo & ebegin |
| 15 |
- `[II]` for elog |
| 16 |
- `[WW]` for ewarn |
| 17 |
- `[QA]` for eqawarn |
| 18 |
- `[EE]` for eerror |
| 19 |
4. Finally, I've replaced most of `>>>` and `!!!` in Portage output with |
| 20 |
four `>>>>` and `!!!!` to align the output again. |
| 21 |
|
| 22 |
PR (includes screenshot): https://github.com/gentoo/portage/pull/759 |
| 23 |
|
| 24 |
Michał Górny (4): |
| 25 |
Prefix color vars with "PORTAGE_COLOR_" |
| 26 |
Use distinct colors for output msg types |
| 27 |
Use verbose prefixes for output messages |
| 28 |
Use ">>>>" and "!!!!" for output prefixes |
| 29 |
|
| 30 |
bin/clean_locks | 2 +- |
| 31 |
bin/dohtml.py | 2 +- |
| 32 |
bin/doins.py | 2 +- |
| 33 |
bin/ebuild | 8 +- |
| 34 |
bin/ebuild-helpers/dobin | 2 +- |
| 35 |
bin/ebuild-helpers/dodoc | 2 +- |
| 36 |
bin/ebuild-helpers/doexe | 2 +- |
| 37 |
bin/ebuild-helpers/doinfo | 2 +- |
| 38 |
bin/ebuild-helpers/dolib | 2 +- |
| 39 |
bin/ebuild-helpers/doman | 2 +- |
| 40 |
bin/ebuild-helpers/domo | 2 +- |
| 41 |
bin/ebuild-helpers/dosbin | 2 +- |
| 42 |
bin/ebuild-helpers/dosed | 4 +- |
| 43 |
bin/ebuild-helpers/keepdir | 2 +- |
| 44 |
bin/ebuild-helpers/newins | 4 +- |
| 45 |
bin/env-update | 2 +- |
| 46 |
bin/fixpackages | 4 +- |
| 47 |
bin/glsa-check | 14 +- |
| 48 |
bin/install-qa-check.d/10ignored-flags | 4 +- |
| 49 |
bin/install.py | 2 +- |
| 50 |
bin/isolated-functions.sh | 50 ++++--- |
| 51 |
bin/misc-functions.sh | 22 +-- |
| 52 |
bin/phase-functions.sh | 64 ++++----- |
| 53 |
bin/phase-helpers.sh | 18 +-- |
| 54 |
bin/portageq | 6 +- |
| 55 |
bin/save-ebuild-env.sh | 18 ++- |
| 56 |
cnf/repo.postsync.d/example | 4 +- |
| 57 |
lib/_emerge/Binpkg.py | 10 +- |
| 58 |
lib/_emerge/BinpkgExtractorAsync.py | 4 +- |
| 59 |
lib/_emerge/BinpkgVerifier.py | 12 +- |
| 60 |
lib/_emerge/BlockerCache.py | 2 +- |
| 61 |
lib/_emerge/BlockerDB.py | 2 +- |
| 62 |
lib/_emerge/EbuildBuild.py | 2 +- |
| 63 |
lib/_emerge/EbuildIpcDaemon.py | 2 +- |
| 64 |
lib/_emerge/EbuildPhase.py | 2 +- |
| 65 |
lib/_emerge/JobStatusDisplay.py | 2 +- |
| 66 |
lib/_emerge/MergeListItem.py | 2 +- |
| 67 |
lib/_emerge/PackageUninstall.py | 6 +- |
| 68 |
lib/_emerge/Scheduler.py | 20 +-- |
| 69 |
lib/_emerge/SpawnProcess.py | 2 +- |
| 70 |
lib/_emerge/SubProcess.py | 2 +- |
| 71 |
lib/_emerge/actions.py | 126 ++++++++++-------- |
| 72 |
lib/_emerge/countdown.py | 4 +- |
| 73 |
lib/_emerge/depgraph.py | 121 +++++++++-------- |
| 74 |
lib/_emerge/main.py | 6 +- |
| 75 |
lib/_emerge/post_emerge.py | 4 +- |
| 76 |
lib/_emerge/resolver/output_helpers.py | 4 +- |
| 77 |
lib/_emerge/resolver/slot_collision.py | 16 +-- |
| 78 |
lib/_emerge/show_invalid_depstring_notice.py | 2 +- |
| 79 |
lib/_emerge/unmerge.py | 44 +++--- |
| 80 |
lib/portage/__init__.py | 24 ++-- |
| 81 |
lib/portage/_selinux.py | 4 +- |
| 82 |
lib/portage/_sets/shell.py | 2 +- |
| 83 |
lib/portage/binrepo/config.py | 4 +- |
| 84 |
lib/portage/data.py | 2 +- |
| 85 |
lib/portage/dbapi/__init__.py | 2 +- |
| 86 |
lib/portage/dbapi/bintree.py | 45 ++++--- |
| 87 |
lib/portage/dbapi/porttree.py | 12 +- |
| 88 |
lib/portage/dbapi/vartree.py | 94 ++++++------- |
| 89 |
lib/portage/dep/__init__.py | 48 +++---- |
| 90 |
lib/portage/elog/__init__.py | 2 +- |
| 91 |
lib/portage/elog/messages.py | 15 ++- |
| 92 |
lib/portage/elog/mod_custom.py | 4 +- |
| 93 |
lib/portage/elog/mod_echo.py | 4 +- |
| 94 |
lib/portage/elog/mod_mail_summary.py | 2 +- |
| 95 |
lib/portage/elog/mod_save_summary.py | 2 +- |
| 96 |
lib/portage/emaint/modules/binhost/binhost.py | 3 +- |
| 97 |
lib/portage/env/loaders.py | 14 +- |
| 98 |
lib/portage/getbinpkg.py | 32 ++--- |
| 99 |
lib/portage/locks.py | 2 +- |
| 100 |
lib/portage/mail.py | 12 +- |
| 101 |
lib/portage/manifest.py | 2 +- |
| 102 |
lib/portage/metadata.py | 6 +- |
| 103 |
lib/portage/news.py | 6 +- |
| 104 |
lib/portage/output.py | 65 +++++++-- |
| 105 |
.../ebuild/_config/LocationsManager.py | 10 +- |
| 106 |
.../_parallel_manifest/ManifestProcess.py | 6 +- |
| 107 |
.../_parallel_manifest/ManifestScheduler.py | 2 +- |
| 108 |
.../ebuild/_parallel_manifest/ManifestTask.py | 6 +- |
| 109 |
lib/portage/package/ebuild/config.py | 61 ++++----- |
| 110 |
.../ebuild/deprecated_profile_check.py | 12 +- |
| 111 |
lib/portage/package/ebuild/digestcheck.py | 24 ++-- |
| 112 |
lib/portage/package/ebuild/digestgen.py | 20 +-- |
| 113 |
lib/portage/package/ebuild/doebuild.py | 36 ++--- |
| 114 |
lib/portage/package/ebuild/fetch.py | 126 +++++++++--------- |
| 115 |
.../package/ebuild/prepare_build_dirs.py | 25 ++-- |
| 116 |
lib/portage/repository/config.py | 31 ++--- |
| 117 |
lib/portage/sync/config_checks.py | 12 +- |
| 118 |
lib/portage/sync/controller.py | 6 +- |
| 119 |
lib/portage/sync/modules/cvs/__init__.py | 2 +- |
| 120 |
lib/portage/sync/modules/cvs/cvs.py | 4 +- |
| 121 |
lib/portage/sync/modules/git/__init__.py | 4 +- |
| 122 |
lib/portage/sync/modules/git/git.py | 14 +- |
| 123 |
.../sync/modules/mercurial/mercurial.py | 4 +- |
| 124 |
lib/portage/sync/modules/rsync/rsync.py | 60 ++++----- |
| 125 |
lib/portage/sync/modules/svn/svn.py | 6 +- |
| 126 |
lib/portage/sync/modules/webrsync/webrsync.py | 10 +- |
| 127 |
lib/portage/sync/old_tree_timestamp.py | 2 +- |
| 128 |
lib/portage/sync/syncbase.py | 6 +- |
| 129 |
lib/portage/tests/resolver/test_autounmask.py | 6 +- |
| 130 |
.../resolver/test_autounmask_use_breakage.py | 6 +- |
| 131 |
...est_slot_conflict_unsatisfied_deep_deps.py | 12 +- |
| 132 |
lib/portage/update.py | 4 +- |
| 133 |
lib/portage/util/__init__.py | 30 ++--- |
| 134 |
.../util/_dyn_libs/PreservedLibsRegistry.py | 4 +- |
| 135 |
.../util/_dyn_libs/display_preserved_libs.py | 4 +- |
| 136 |
lib/portage/util/env_update.py | 8 +- |
| 137 |
lib/portage/util/locale.py | 2 +- |
| 138 |
lib/portage/util/movefile.py | 40 +++--- |
| 139 |
lib/portage/util/mtimedb.py | 5 +- |
| 140 |
lib/portage/util/writeable_check.py | 4 +- |
| 141 |
lib/portage/versions.py | 20 +-- |
| 142 |
lib/portage/xml/metadata.py | 18 +-- |
| 143 |
misc/emerge-delta-webrsync | 8 +- |
| 144 |
repoman/lib/repoman/__init__.py | 12 +- |
| 145 |
repoman/lib/repoman/actions.py | 24 ++-- |
| 146 |
repoman/lib/repoman/gpg.py | 2 +- |
| 147 |
.../lib/repoman/modules/commit/manifest.py | 4 +- |
| 148 |
repoman/lib/repoman/modules/vcs/cvs/status.py | 6 +- |
| 149 |
.../lib/repoman/modules/vcs/git/changes.py | 2 +- |
| 150 |
repoman/lib/repoman/modules/vcs/svn/status.py | 6 +- |
| 151 |
repoman/lib/repoman/scanner.py | 4 +- |
| 152 |
122 files changed, 937 insertions(+), 836 deletions(-) |
| 153 |
|
| 154 |
-- |
| 155 |
2.33.0 |
Archives