From 99832a79bff002a7494c4fb31701451c13a5a435 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 21 Aug 2010 07:18:47 -0700 Subject: When accessing pkgsettings.features inside Scheduler._generate_digests(), ensure that we are using global features settings rather than those from package.env. --- pym/_emerge/Scheduler.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pym/_emerge/Scheduler.py') diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 2a052af4c..1c732c309 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -648,6 +648,10 @@ class Scheduler(PollScheduler): digest = '--digest' in self.myopts if not digest: for pkgsettings in self.pkgsettings.values(): + if pkgsettings.mycpv is not None: + # ensure that we are using global features + # settings rather than those from package.env + pkgsettings.reset() if 'digest' in pkgsettings.features: digest = True break @@ -661,6 +665,10 @@ class Scheduler(PollScheduler): x.operation != 'merge': continue pkgsettings = self.pkgsettings[x.root] + if pkgsettings.mycpv is not None: + # ensure that we are using global features + # settings rather than those from package.env + pkgsettings.reset() if '--digest' not in self.myopts and \ 'digest' not in pkgsettings.features: continue -- cgit v1.2.3-1-g7c22