1 |
On Mon, 9 Mar 2015 12:32:02 -0700 |
2 |
Zac Medico <zmedico@g.o> wrote: |
3 |
|
4 |
> Since commit c3586c5e15c8373d08f9192713a2b03d4542faaf, the |
5 |
> WorldSelectedSet load method does not force the set to load if it has |
6 |
> already been loaded. Fix it to do so. |
7 |
> |
8 |
> Fixes: c3586c5e15c8 ("WorldSelectedSet: fix breakage for bug #539746") |
9 |
> X-Gentoo-Bug: 542732 |
10 |
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=542732 |
11 |
> --- |
12 |
> pym/portage/_sets/files.py | 5 ++++- |
13 |
> 1 file changed, 4 insertions(+), 1 deletion(-) |
14 |
> |
15 |
> diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py |
16 |
> index 26ee094..e045701 100644 |
17 |
> --- a/pym/portage/_sets/files.py |
18 |
> +++ b/pym/portage/_sets/files.py |
19 |
> @@ -221,7 +221,10 @@ class WorldSelectedSet(EditablePackageSet): |
20 |
> self._setset.write() |
21 |
> |
22 |
> def load(self): |
23 |
> - # Iterating over these sets loads them automatically. |
24 |
> + # Iterating over these sets does not force them to |
25 |
> load if they |
26 |
> + # have been loaded previously. |
27 |
> + self._pkgset.load() |
28 |
> + self._setset.load() |
29 |
> self._setAtoms(chain(self._pkgset, self._setset)) |
30 |
> |
31 |
> def lock(self): |
32 |
|
33 |
|
34 |
LGTM, don't know if it fixes it, but you are the expert there ;) |
35 |
-- |
36 |
Brian Dolbec <dolsen> |