commit: a12931c44302f1bed0dd4ade0a6fa7b0002fe9aa Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon May 25 18:29:19 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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; }