1 |
commit: 9644dda59e3604ab831a35bdc5700ba0304a1d9d |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 25 18:07:56 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 25 18:07:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9644dda5 |
7 |
|
8 |
qmerge: fix package names |
9 |
|
10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
11 |
|
12 |
qmerge.c | 12 ++++++------ |
13 |
1 file changed, 6 insertions(+), 6 deletions(-) |
14 |
|
15 |
diff --git a/qmerge.c b/qmerge.c |
16 |
index 51fe6de..f330a00 100644 |
17 |
--- a/qmerge.c |
18 |
+++ b/qmerge.c |
19 |
@@ -1599,11 +1599,11 @@ pkg_verify_checksums( |
20 |
if (hash_multiple_file(fname, md5, sha1, NULL, NULL, NULL, NULL, |
21 |
&flen, HASH_MD5 | HASH_SHA1) == -1) |
22 |
errf("failed to compute hashes for %s/%s: %s\n", |
23 |
- atom->CATEGORY, pkg->PF, strerror(errno)); |
24 |
+ pkg->CATEGORY, pkg->PF, strerror(errno)); |
25 |
|
26 |
if (flen != pkg->SIZE) { |
27 |
warn("filesize %zu doesn't match requested size %zu for %s/%s\n", |
28 |
- flen, pkg->SIZE, atom->CATEGORY, pkg->PF); |
29 |
+ flen, pkg->SIZE, pkg->CATEGORY, pkg->PF); |
30 |
ret++; |
31 |
} |
32 |
|
33 |
@@ -1611,11 +1611,11 @@ pkg_verify_checksums( |
34 |
if (strcmp(md5, pkg->MD5) == 0) { |
35 |
if (display) |
36 |
printf("MD5: [%sOK%s] %s %s/%s\n", |
37 |
- GREEN, NORM, md5, atom->CATEGORY, pkg->PF); |
38 |
+ GREEN, NORM, md5, pkg->CATEGORY, pkg->PF); |
39 |
} else { |
40 |
if (display) |
41 |
warn("MD5: [%sER%s] (%s) != (%s) %s/%s", |
42 |
- RED, NORM, md5, pkg->MD5, atom->CATEGORY, pkg->PF); |
43 |
+ RED, NORM, md5, pkg->MD5, pkg->CATEGORY, pkg->PF); |
44 |
ret++; |
45 |
} |
46 |
} |
47 |
@@ -1624,11 +1624,11 @@ pkg_verify_checksums( |
48 |
if (strcmp(sha1, pkg->SHA1) == 0) { |
49 |
if (display) |
50 |
qprintf("SHA1: [%sOK%s] %s %s/%s\n", |
51 |
- GREEN, NORM, sha1, atom->CATEGORY, pkg->PF); |
52 |
+ GREEN, NORM, sha1, pkg->CATEGORY, pkg->PF); |
53 |
} else { |
54 |
if (display) |
55 |
warn("SHA1: [%sER%s] (%s) != (%s) %s/%s", |
56 |
- RED, NORM, sha1, pkg->SHA1, atom->CATEGORY, pkg->PF); |
57 |
+ RED, NORM, sha1, pkg->SHA1, pkg->CATEGORY, pkg->PF); |
58 |
ret++; |
59 |
} |
60 |
} |