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: Mon, 25 Nov 2019 19:39:55
Message-Id: 1574710770.0cea31fbdca8097a9d7d6ae431d09c7d7130a6e7.grobian@gentoo
1 commit: 0cea31fbdca8097a9d7d6ae431d09c7d7130a6e7
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 25 19:39:30 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 25 19:39:30 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=0cea31fb
7
8 main: properly track origin of PORTDIR variable
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 main.c | 5 ++++-
13 1 file changed, 4 insertions(+), 1 deletion(-)
14
15 diff --git a/main.c b/main.c
16 index fb2340b..6033429 100644
17 --- a/main.c
18 +++ b/main.c
19 @@ -638,8 +638,11 @@ read_one_repos_conf(const char *repos_conf)
20 xarraypush_str(overlay_names, repo);
21 xarraypush_str(overlay_src, repos_conf);
22 }
23 - if (main_repo && strcmp(repo, main_repo) == 0)
24 + if (main_repo && strcmp(repo, main_repo) == 0) {
25 main_overlay = ele;
26 + free(vars_to_read[11 /* PORTDIR */].src);
27 + vars_to_read[11 /* PORTDIR */].src = xstrdup(repos_conf);
28 + }
29 }
30 free(conf);
31 }