1 |
commit: a12931c44302f1bed0dd4ade0a6fa7b0002fe9aa |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 25 18:29:19 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 25 18:29:19 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a12931c4 |
7 |
|
8 |
qmerge: drop unused argument to pkg_verify_checksums |
9 |
|
10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
11 |
|
12 |
qmerge.c | 7 +++---- |
13 |
1 file changed, 3 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/qmerge.c b/qmerge.c |
16 |
index 7d801b4..80c34a0 100644 |
17 |
--- a/qmerge.c |
18 |
+++ b/qmerge.c |
19 |
@@ -1587,7 +1587,6 @@ static int |
20 |
pkg_verify_checksums( |
21 |
char *fname, |
22 |
const struct pkg_t *pkg, |
23 |
- const depend_atom *atom, |
24 |
int strict, |
25 |
int display) |
26 |
{ |
27 |
@@ -1669,7 +1668,7 @@ pkg_fetch(int level, const depend_atom *atom, const struct pkg_t *pkg) |
28 |
if (force_download && (access(buf, R_OK) == 0) && |
29 |
(pkg->SHA1[0] || pkg->MD5[0])) |
30 |
{ |
31 |
- if (pkg_verify_checksums(buf, pkg, atom, 0, 0) != 0) |
32 |
+ if (pkg_verify_checksums(buf, pkg, 0, 0) != 0) |
33 |
if (getenv("QMERGE") == NULL) |
34 |
unlink(buf); |
35 |
} |
36 |
@@ -1678,7 +1677,7 @@ pkg_fetch(int level, const depend_atom *atom, const struct pkg_t *pkg) |
37 |
warn("No checksum data for %s (try `emaint binhost --fix`)", buf); |
38 |
return; |
39 |
} else { |
40 |
- if (pkg_verify_checksums(buf, pkg, atom, qmerge_strict, !quiet) |
41 |
+ if (pkg_verify_checksums(buf, pkg, qmerge_strict, !quiet) |
42 |
== 0) |
43 |
{ |
44 |
pkg_merge(0, atom, pkg); |
45 |
@@ -1716,7 +1715,7 @@ pkg_fetch(int level, const depend_atom *atom, const struct pkg_t *pkg) |
46 |
|
47 |
snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2", |
48 |
pkgdir, atom->CATEGORY, pkg->PF); |
49 |
- if (pkg_verify_checksums(buf, pkg, atom, qmerge_strict, !quiet) == 0) { |
50 |
+ if (pkg_verify_checksums(buf, pkg, qmerge_strict, !quiet) == 0) { |
51 |
pkg_merge(0, atom, pkg); |
52 |
return; |
53 |
} |