Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/scan/
Date: Wed, 31 Mar 2021 07:35:57
Message-Id: 1617176030.d04486767159f9dba443e7a9d1a6c3854db00400.zmedico@gentoo
1 commit: d04486767159f9dba443e7a9d1a6c3854db00400
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 31 07:30:51 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 31 07:33:50 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d0448676
7
8 repoman: fix ModuleConfig _not_installed path (bug 779055)
9
10 Bug: https://bugs.gentoo.org/779055
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 repoman/lib/repoman/modules/scan/module.py | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/repoman/lib/repoman/modules/scan/module.py b/repoman/lib/repoman/modules/scan/module.py
17 index 3321cb224..41c1becfc 100644
18 --- a/repoman/lib/repoman/modules/scan/module.py
19 +++ b/repoman/lib/repoman/modules/scan/module.py
20 @@ -31,9 +31,9 @@ class ModuleConfig:
21 if repository_modules:
22 self.configpaths = [os.path.join(path, 'repository.yaml') for path in configpaths]
23 elif _not_installed:
24 - self.configpaths = [os.path.realpath(os.path.join(os.path.dirname(
25 + self.configpaths = [os.path.realpath(os.path.join(
26 os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(
27 - os.path.dirname(__file__)))))), 'repoman/cnf/repository/repository.yaml'))]
28 + os.path.dirname(__file__))))), 'cnf/repository/repository.yaml'))]
29 else:
30 self.configpaths = [os.path.join(portage.const.EPREFIX or '/',
31 'usr/share/repoman/repository/repository.yaml')]