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 2D7131382C5 for ; Mon, 25 May 2020 18:08:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AB41E0823; Mon, 25 May 2020 18:08:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 34039E0823 for ; Mon, 25 May 2020 18:08:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 00C9834EF6C for ; Mon, 25 May 2020 18:08:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A6E7D23E for ; Mon, 25 May 2020 18:08:02 +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: <1590430076.9644dda59e3604ab831a35bdc5700ba0304a1d9d.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 9644dda59e3604ab831a35bdc5700ba0304a1d9d X-VCS-Branch: master Date: Mon, 25 May 2020 18:08:02 +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: 584877b3-f789-4704-8d88-08c6a3611f9d X-Archives-Hash: 4ce6bb65a28b02d6e29fcfeb1b3b20ab commit: 9644dda59e3604ab831a35bdc5700ba0304a1d9d Author: Fabian Groffen gentoo org> AuthorDate: Mon May 25 18:07:56 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon May 25 18:07:56 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9644dda5 qmerge: fix package names Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qmerge.c b/qmerge.c index 51fe6de..f330a00 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1599,11 +1599,11 @@ pkg_verify_checksums( if (hash_multiple_file(fname, md5, sha1, NULL, NULL, NULL, NULL, &flen, HASH_MD5 | HASH_SHA1) == -1) errf("failed to compute hashes for %s/%s: %s\n", - atom->CATEGORY, pkg->PF, strerror(errno)); + pkg->CATEGORY, pkg->PF, strerror(errno)); if (flen != pkg->SIZE) { warn("filesize %zu doesn't match requested size %zu for %s/%s\n", - flen, pkg->SIZE, atom->CATEGORY, pkg->PF); + flen, pkg->SIZE, pkg->CATEGORY, pkg->PF); ret++; } @@ -1611,11 +1611,11 @@ pkg_verify_checksums( if (strcmp(md5, pkg->MD5) == 0) { if (display) printf("MD5: [%sOK%s] %s %s/%s\n", - GREEN, NORM, md5, atom->CATEGORY, pkg->PF); + GREEN, NORM, md5, pkg->CATEGORY, pkg->PF); } else { if (display) warn("MD5: [%sER%s] (%s) != (%s) %s/%s", - RED, NORM, md5, pkg->MD5, atom->CATEGORY, pkg->PF); + RED, NORM, md5, pkg->MD5, pkg->CATEGORY, pkg->PF); ret++; } } @@ -1624,11 +1624,11 @@ pkg_verify_checksums( if (strcmp(sha1, pkg->SHA1) == 0) { if (display) qprintf("SHA1: [%sOK%s] %s %s/%s\n", - GREEN, NORM, sha1, atom->CATEGORY, pkg->PF); + GREEN, NORM, sha1, pkg->CATEGORY, pkg->PF); } else { if (display) warn("SHA1: [%sER%s] (%s) != (%s) %s/%s", - RED, NORM, sha1, pkg->SHA1, atom->CATEGORY, pkg->PF); + RED, NORM, sha1, pkg->SHA1, pkg->CATEGORY, pkg->PF); ret++; } }