Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Fri, 31 Jan 2020 10:49:54
Message-Id: 1580068065.9ae224a10bb95117e7d153353cd552a6471cb878.grobian@gentoo
1 commit: 9ae224a10bb95117e7d153353cd552a6471cb878
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 26 19:47:45 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 26 19:47:45 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9ae224a1
7
8 qmerge: reformat
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 qmerge.c | 9 ++++++---
13 1 file changed, 6 insertions(+), 3 deletions(-)
14
15 diff --git a/qmerge.c b/qmerge.c
16 index 156f262..fc20f10 100644
17 --- a/qmerge.c
18 +++ b/qmerge.c
19 @@ -1711,7 +1711,8 @@ pkg_fetch(int level, const depend_atom *atom, const struct pkg_t *pkg)
20 snprintf(buf, sizeof(buf), "%s/%s.tbz2", atom->CATEGORY, pkg->PF);
21 fetch(str, buf);
22 }
23 - snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2", pkgdir, atom->CATEGORY, pkg->PF);
24 + snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2",
25 + pkgdir, atom->CATEGORY, pkg->PF);
26 if (access(buf, R_OK) != 0) {
27 snprintf(buf, sizeof(buf), "%s.tbz2", pkg->PF);
28 fetch(str, buf);
29 @@ -1719,7 +1720,8 @@ pkg_fetch(int level, const depend_atom *atom, const struct pkg_t *pkg)
30 }
31
32 /* verify the pkg exists now. unlink if zero bytes */
33 - snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2", pkgdir, atom->CATEGORY, pkg->PF);
34 + snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2",
35 + pkgdir, atom->CATEGORY, pkg->PF);
36 unlink_empty(buf);
37
38 if (access(buf, R_OK) != 0) {
39 @@ -1728,7 +1730,8 @@ pkg_fetch(int level, const depend_atom *atom, const struct pkg_t *pkg)
40 return;
41 }
42
43 - snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2", pkgdir, atom->CATEGORY, pkg->PF);
44 + snprintf(buf, sizeof(buf), "%s/%s/%s.tbz2",
45 + pkgdir, atom->CATEGORY, pkg->PF);
46 if (pkg_verify_checksums(buf, pkg, atom, qmerge_strict, !quiet) == 0) {
47 pkg_merge(0, atom, pkg);
48 return;