Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/emaint/modules/binhost/
Date: Mon, 02 Sep 2019 00:08:23
Message-Id: 1567382180.2565d3a60315df2edff080b49547ec98ce24b595.zmedico@gentoo
1 commit: 2565d3a60315df2edff080b49547ec98ce24b595
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 1 23:50:14 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 1 23:56:20 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2565d3a6
7
8 emaint binhost: force reindex in case of pkgdir-index-trusted
9
10 Bug: https://bugs.gentoo.org/688902
11 Fixes: fbbe0cfe2902 ("Add FEATURES=pkgdir-index-trusted")
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 lib/portage/emaint/modules/binhost/binhost.py | 6 ++++++
15 1 file changed, 6 insertions(+)
16
17 diff --git a/lib/portage/emaint/modules/binhost/binhost.py b/lib/portage/emaint/modules/binhost/binhost.py
18 index 4d1d63601..cf9516112 100644
19 --- a/lib/portage/emaint/modules/binhost/binhost.py
20 +++ b/lib/portage/emaint/modules/binhost/binhost.py
21 @@ -66,6 +66,9 @@ class BinhostHandler(object):
22 def check(self, **kwargs):
23 onProgress = kwargs.get('onProgress', None)
24 bintree = self._bintree
25 + # Force reindex in case pkgdir-index-trusted is enabled.
26 + bintree._populate_local(reindex=True)
27 + bintree.populated = True
28 _instance_key = bintree.dbapi._instance_key
29 cpv_all = self._bintree.dbapi.cpv_all()
30 cpv_all.sort()
31 @@ -99,6 +102,9 @@ class BinhostHandler(object):
32 def fix(self, **kwargs):
33 onProgress = kwargs.get('onProgress', None)
34 bintree = self._bintree
35 + # Force reindex in case pkgdir-index-trusted is enabled.
36 + bintree._populate_local(reindex=True)
37 + bintree.populated = True
38 _instance_key = bintree.dbapi._instance_key
39 cpv_all = self._bintree.dbapi.cpv_all()
40 cpv_all.sort()