From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4DA5C138334 for ; Thu, 25 Apr 2019 17:36:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 604B8E0951; Thu, 25 Apr 2019 17:36:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 472E0E0951 for ; Thu, 25 Apr 2019 17:36:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE4DB342750 for ; Thu, 25 Apr 2019 17:36:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91FFA57E for ; Thu, 25 Apr 2019 17:36:41 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1556213769.df503f922e4070fdbb5bbe4731f79b15709a5ade.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qatom.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: df503f922e4070fdbb5bbe4731f79b15709a5ade X-VCS-Branch: master Date: Thu, 25 Apr 2019 17:36:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b1523e08-31bb-4b06-b25f-5399edab8464 X-Archives-Hash: 068811b032a9a3f584d1f0c724929cfb commit: df503f922e4070fdbb5bbe4731f79b15709a5ade Author: Fabian Groffen gentoo org> AuthorDate: Thu Apr 25 17:36:09 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Apr 25 17:36:09 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=df503f92 qatom: print SUBSLOT as part of SLOT Signed-off-by: Fabian Groffen gentoo.org> qatom.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/qatom.c b/qatom.c index 20e2dcb..e3d2b0b 100644 --- a/qatom.c +++ b/qatom.c @@ -94,20 +94,23 @@ qatom_printf(const char *format, const depend_atom *atom, int pverbose) printf("r%i", atom->PR_int); } else if (!strncmp("SLOT", fmt, len)) { if (showit || atom->SLOT) - printf(":%s%s", - atom->SLOT ? atom->SLOT : "-", + printf("%s%s%s%s%s", + atom->SLOT ? ":" : "", + atom->SLOT ? atom->SLOT : "", + atom->SUBSLOT ? "/" : "", + atom->SUBSLOT ? atom->SUBSLOT : "", atom_slotdep_str[atom->slotdep]); } else if (!strncmp("REPO", fmt, len)) { if (showit || atom->REPO) printf("::%s", HN(atom->REPO)); } else if (!strncmp("pfx", fmt, len)) { if (showit || atom->pfx_op != ATOM_OP_NONE) - fputs(atom->pfx_op == ATOM_OP_NONE ? - "-" : atom_op_str[atom->pfx_op], stdout); + printf("%s", atom->pfx_op == ATOM_OP_NONE ? + "" : atom_op_str[atom->pfx_op]); } else if (!strncmp("sfx", fmt, len)) { if (showit || atom->sfx_op != ATOM_OP_NONE) - fputs(atom->sfx_op == ATOM_OP_NONE ? - "-" : atom_op_str[atom->sfx_op], stdout); + printf("%s", atom->sfx_op == ATOM_OP_NONE ? + "" : atom_op_str[atom->sfx_op]); } else printf("", (int)len, fmt); ++p;