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, 15 Nov 2019 13:52:21
Message-Id: 1573735142.2c58dc24df8cccf41d4126bb51e5cea8abaabb0f.grobian@gentoo
1 commit: 2c58dc24df8cccf41d4126bb51e5cea8abaabb0f
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 14 12:39:02 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 14 12:39:02 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=2c58dc24
7
8 qpkg: drop binpkgs in CATEGORY subdir for compliance
9
10 emaint doesn't get a pile of binpkgs, so stash them where it expects
11 them
12
13 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
14
15 qpkg.c | 9 ++++++++-
16 1 file changed, 8 insertions(+), 1 deletion(-)
17
18 diff --git a/qpkg.c b/qpkg.c
19 index 947ff84..7a1baae 100644
20 --- a/qpkg.c
21 +++ b/qpkg.c
22 @@ -29,6 +29,7 @@
23 #include "xarray.h"
24 #include "xasprintf.h"
25 #include "xchdir.h"
26 +#include "xmkdir.h"
27 #include "xpak.h"
28
29 #define QPKG_FLAGS "cEpP:" COMMON_FLAGS
30 @@ -309,7 +310,13 @@ qpkg_make(depend_atom *atom)
31
32 unlink(filelist);
33
34 - snprintf(buf, buflen, "%s/%s.tbz2", qpkg_bindir, atom_to_pvr(atom));
35 + /* create dirs, if necessary */
36 + snprintf(buf, buflen, "%s/%s",
37 + qpkg_bindir, atom->CATEGORY);
38 + mkdir_p(buf, 0755);
39 +
40 + snprintf(buf, buflen, "%s/%s/%s.tbz2",
41 + qpkg_bindir, atom->CATEGORY, atom_to_pvr(atom));
42 if (rename(tbz2, buf)) {
43 warnp("could not move '%s' to '%s'", tbz2, buf);
44 free(buf);