aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2018-03-30 22:13:28 +0200
committerFabian Groffen <grobian@gentoo.org>2018-03-30 22:16:41 +0200
commitb05c690acf8e97890471f4ef45eee821699f13b3 (patch)
treebf7ed258479d0823fec132b6a8d4cc7504fb7f60
parentread_portage_env_file: make debug print the real location (diff)
downloadportage-utils-b05c690acf8e97890471f4ef45eee821699f13b3.tar.gz
portage-utils-b05c690acf8e97890471f4ef45eee821699f13b3.tar.bz2
portage-utils-b05c690acf8e97890471f4ef45eee821699f13b3.zip
initialize_portage_env: move debug var printing after repos.conf
in particular PORTDIR may get set, so ensure we print the value that's going to be used
-rw-r--r--main.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/main.c b/main.c
index 7c55358..8000540 100644
--- a/main.c
+++ b/main.c
@@ -943,18 +943,6 @@ initialize_portage_env(void)
}
}
- if (getenv("DEBUG")) {
- for (i = 0; vars_to_read[i].name; ++i) {
- var = &vars_to_read[i];
- fprintf(stderr, "%s = ", var->name);
- switch (var->type) {
- case _Q_BOOL: fprintf(stderr, "%i\n", *var->value.b); break;
- case _Q_STR:
- case _Q_ISTR: fprintf(stderr, "%s\n", *var->value.s); break;
- }
- }
- }
-
/* Make sure ROOT always ends in a slash */
var = &vars_to_read[0];
if ((*var->value.s)[var->value_len - 1] != '/') {
@@ -970,6 +958,18 @@ initialize_portage_env(void)
if (array_cnt(overlays) == 0)
xarraypush_str(overlays, main_overlay);
+ if (getenv("DEBUG")) {
+ for (i = 0; vars_to_read[i].name; ++i) {
+ var = &vars_to_read[i];
+ fprintf(stderr, "%s = ", var->name);
+ switch (var->type) {
+ case _Q_BOOL: fprintf(stderr, "%i\n", *var->value.b); break;
+ case _Q_STR:
+ case _Q_ISTR: fprintf(stderr, "%s\n", *var->value.s); break;
+ }
+ }
+ }
+
if (getenv("PORTAGE_QUIET") != NULL)
setup_quiet();