aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2015-03-09 12:31:21 -0700
committerZac Medico <zmedico@gentoo.org>2015-03-09 12:51:46 -0700
commit0bdfd62184d3224c23f5293683ba6fb5c0769e6a (patch)
treef2ee123079e8b5cb415c70bba8cef90f6721e8c7
parentRELEASE-NOTES: fix typo in bug number (diff)
downloadportage-0bdfd62184d3224c23f5293683ba6fb5c0769e6a.tar.gz
portage-0bdfd62184d3224c23f5293683ba6fb5c0769e6a.tar.bz2
portage-0bdfd62184d3224c23f5293683ba6fb5c0769e6a.zip
WorldSelectedSet: fix load method for bug 542732
Since commit c3586c5e15c8373d08f9192713a2b03d4542faaf, the WorldSelectedSet load method does not force the set to load if it has already been loaded. Fix it to do so. Fixes: c3586c5e15c8 ("WorldSelectedSet: fix breakage for bug #539746") X-Gentoo-Bug: 542732 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=542732 Acked-by: Brian Dolbec <dolsen@gentoo.org>
-rw-r--r--pym/portage/_sets/files.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py
index 26ee094b5..e045701ff 100644
--- a/pym/portage/_sets/files.py
+++ b/pym/portage/_sets/files.py
@@ -221,7 +221,10 @@ class WorldSelectedSet(EditablePackageSet):
self._setset.write()
def load(self):
- # Iterating over these sets loads them automatically.
+ # Iterating over these sets does not force them to load if they
+ # have been loaded previously.
+ self._pkgset.load()
+ self._setset.load()
self._setAtoms(chain(self._pkgset, self._setset))
def lock(self):