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 66E0D1382C5 for ; Mon, 25 May 2020 18:29:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F4B9E081E; Mon, 25 May 2020 18:29:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 73A61E081E for ; Mon, 25 May 2020 18:29:48 +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 E4A6F34EFAF for ; Mon, 25 May 2020 18:29:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F09CA21E for ; Mon, 25 May 2020 18:29:44 +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: <1590431359.a12931c44302f1bed0dd4ade0a6fa7b0002fe9aa.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: a12931c44302f1bed0dd4ade0a6fa7b0002fe9aa X-VCS-Branch: master Date: Mon, 25 May 2020 18:29:44 +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: 369245b5-6e92-4324-85dc-d1240e26b722 X-Archives-Hash: 9b1cddee114fdaa23753b4b20fd224db commit: a12931c44302f1bed0dd4ade0a6fa7b0002fe9aa Author: Fabian Groffen gentoo org> AuthorDate: Mon May 25 18:29:19 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon May 25 18:29:19 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a12931c4 qmerge: drop unused argument to pkg_verify_checksums Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qmerge.c b/qmerge.c index 7d801b4..80c34a0 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1587,7 +1587,6 @@ static int pkg_verify_checksums( char *fname, const struct pkg_t *pkg, - const depend_atom *atom, int strict, int display) { @@ -1669,7 +1668,7 @@ pkg_fetch(int level, const depend_atom *atom, const struct pkg_t *pkg) if (force_download && (access(buf, R_OK) == 0) && (pkg->SHA1[0] || pkg->MD5[0])) { - if (pkg_verify_checksums(buf, pkg, atom, 0, 0) != 0) + if (pkg_verify_checksums(buf, pkg, 0, 0) != 0) if (getenv("QMERGE") == NULL) unlink(buf); } @@ -1678,7 +1677,7 @@ pkg_fetch(int level, const depend_atom *atom, const struct pkg_t *pkg) warn("No checksum data for %s (try `emaint binhost --fix`)", buf); return; } else { - if (pkg_verify_checksums(buf, pkg, atom, qmerge_strict, !quiet) + if (pkg_verify_checksums(buf, pkg, qmerge_strict, !quiet) == 0) { pkg_merge(0, atom, pkg); @@ -1716,7 +1715,7 @@ pkg_fetch(int level, const depend_atom *atom, const struct pkg_t *pkg) snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2", pkgdir, atom->CATEGORY, pkg->PF); - if (pkg_verify_checksums(buf, pkg, atom, qmerge_strict, !quiet) == 0) { + if (pkg_verify_checksums(buf, pkg, qmerge_strict, !quiet) == 0) { pkg_merge(0, atom, pkg); return; }