From 1fec1c9c791275d82ee34240c02c4abc92f9d5fe Mon Sep 17 00:00:00 2001 From: necoro <> Date: Mon, 10 Sep 2007 22:28:08 +0000 Subject: fixed masked useflag bug --- portato/backend/portage/package.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'portato/backend/portage/package.py') diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py index eea0ec8..38dcb4b 100644 --- a/portato/backend/portage/package.py +++ b/portato/backend/portage/package.py @@ -10,7 +10,7 @@ # # Written by René 'Necoro' Neumann -from __future__ import absolute_import +from __future__ import absolute_import, with_statement from ..package import Package from .. import flags @@ -40,8 +40,11 @@ class PortagePackage (Package): self._trees = system.settings.trees self.forced_flags = set() - self.forced_flags.update(self._settings.settings.usemask) - self.forced_flags.update(self._settings.settings.useforce) + + with self._settingslock: + self._settings.settings.setcpv(self._cpv) + self.forced_flags.update(self._settings.settings.usemask) + self.forced_flags.update(self._settings.settings.useforce) try: self._status = portage.getmaskingstatus(self.get_cpv(), settings = self._settings.settings) @@ -228,10 +231,10 @@ class PortagePackage (Package): return dep_pkgs def get_global_settings(self, key): - self._settingslock.acquire() - self._settings.settings.setcpv(self._cpv) - v = self._settings.settings[key] - self._settingslock.release() + with self._settingslock: + self._settings.settings.setcpv(self._cpv) + v = self._settings.settings[key] + return v def get_ebuild_path(self): -- cgit v1.2.3-54-g00ecf