[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     012fc848e1026049d69d24c5f8f5dc0509004b6a
Author:     Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com>
AuthorDate: Tue May 14 16:58:16 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May 16 17:02:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=012fc848

qmerge: improve messages somewhat

print SLOT in print_Pkg
print PF in status messages

Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 qmerge.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qmerge.c b/qmerge.c
index f32d669..9ff7f28 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1378,7 +1378,7 @@ pkg_merge(int level, const depend_atom *atom, const 
struct pkg_t *pkg)
                                goto next_pkg;
                }
 
-               qprintf("%s+++%s %s/%s %s %s/%s\n",
+               printf("%s+++%s %s/%s %s %s/%s\n",
                                GREEN, NORM, atom->CATEGORY, pkg->PF,
                                booga[ret], cat_ctx->name, pkg_ctx->name);
 
@@ -1421,7 +1421,7 @@ pkg_merge(int level, const depend_atom *atom, const 
struct pkg_t *pkg)
        rmdir("../qmerge");
 
        printf("%s>>>%s %s%s%s/%s%s%s\n",
-                       YELLOW, NORM, WHITE, atom->CATEGORY, NORM, CYAN, 
atom->PN, NORM);
+                       YELLOW, NORM, WHITE, atom->CATEGORY, NORM, CYAN, 
pkg->PF, NORM);
 
        tree_close(vdb);
 }
@@ -1738,7 +1738,7 @@ print_Pkg(int full, const depend_atom *atom, const struct 
pkg_t *pkg)
        char *p = NULL;
        char buf[512];
 
-       printf("%s%s/%s%s%s%s%s%s\n", BOLD, atom->CATEGORY, BLUE, pkg->PF, NORM,
+       printf("%s%s/%s%s:%s%s%s%s%s\n", BOLD, atom->CATEGORY, BLUE, pkg->PF, 
pkg->SLOT, NORM,
                !quiet ? " [" : "",
                !quiet ? make_human_readable_str(pkg->SIZE, 1, KILOBYTE) : "",
                !quiet ? " KiB]" : "");