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: Sat, 31 Mar 2018 06:54:43
Message-Id: 1522441001.b05c690acf8e97890471f4ef45eee821699f13b3.grobian@gentoo
1 commit: b05c690acf8e97890471f4ef45eee821699f13b3
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 30 20:13:28 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 30 20:16:41 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b05c690a
7
8 initialize_portage_env: move debug var printing after repos.conf
9
10 in particular PORTDIR may get set, so ensure we print the value that's
11 going to be used
12
13 main.c | 24 ++++++++++++------------
14 1 file changed, 12 insertions(+), 12 deletions(-)
15
16 diff --git a/main.c b/main.c
17 index 7c55358..8000540 100644
18 --- a/main.c
19 +++ b/main.c
20 @@ -943,18 +943,6 @@ initialize_portage_env(void)
21 }
22 }
23
24 - if (getenv("DEBUG")) {
25 - for (i = 0; vars_to_read[i].name; ++i) {
26 - var = &vars_to_read[i];
27 - fprintf(stderr, "%s = ", var->name);
28 - switch (var->type) {
29 - case _Q_BOOL: fprintf(stderr, "%i\n", *var->value.b); break;
30 - case _Q_STR:
31 - case _Q_ISTR: fprintf(stderr, "%s\n", *var->value.s); break;
32 - }
33 - }
34 - }
35 -
36 /* Make sure ROOT always ends in a slash */
37 var = &vars_to_read[0];
38 if ((*var->value.s)[var->value_len - 1] != '/') {
39 @@ -970,6 +958,18 @@ initialize_portage_env(void)
40 if (array_cnt(overlays) == 0)
41 xarraypush_str(overlays, main_overlay);
42
43 + if (getenv("DEBUG")) {
44 + for (i = 0; vars_to_read[i].name; ++i) {
45 + var = &vars_to_read[i];
46 + fprintf(stderr, "%s = ", var->name);
47 + switch (var->type) {
48 + case _Q_BOOL: fprintf(stderr, "%i\n", *var->value.b); break;
49 + case _Q_STR:
50 + case _Q_ISTR: fprintf(stderr, "%s\n", *var->value.s); break;
51 + }
52 + }
53 + }
54 +
55 if (getenv("PORTAGE_QUIET") != NULL)
56 setup_quiet();