diff options
author | Richard Purdie <richard@openedhand.com> | 2007-09-02 14:10:08 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-09-02 14:10:08 +0000 |
commit | e223238b1b88c9b6888972b7944b3854319e4928 (patch) | |
tree | ae78533078bd8e7382d50778cec144541eae65f6 /bitbake/lib/bb/cooker.py | |
parent | 1cf731b1e3bb125449c2ef4e1194b6bf69e7b667 (diff) | |
download | poky-e223238b1b88c9b6888972b7944b3854319e4928.tar.gz |
bitbake: Update to latest bitbake-1.8 branch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2651 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 2ddb590c5b..c16709e552 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -85,6 +85,13 @@ class BBCooker: | |||
85 | tcattr[3] = tcattr[3] & ~termios.TOSTOP | 85 | tcattr[3] = tcattr[3] & ~termios.TOSTOP |
86 | termios.tcsetattr(fd, termios.TCSANOW, tcattr) | 86 | termios.tcsetattr(fd, termios.TCSANOW, tcattr) |
87 | 87 | ||
88 | # Change nice level if we're asked to | ||
89 | nice = bb.data.getVar("BB_NICE_LEVEL", self.configuration.data, True) | ||
90 | if nice: | ||
91 | curnice = os.nice(0) | ||
92 | nice = int(nice) - curnice | ||
93 | bb.msg.note(2, bb.msg.domain.Build, "Renice to %s " % os.nice(nice)) | ||
94 | |||
88 | 95 | ||
89 | def tryBuildPackage(self, fn, item, task, the_data, build_depends): | 96 | def tryBuildPackage(self, fn, item, task, the_data, build_depends): |
90 | """ | 97 | """ |
@@ -270,7 +277,11 @@ class BBCooker: | |||
270 | 277 | ||
271 | # Handle PREFERRED_PROVIDERS | 278 | # Handle PREFERRED_PROVIDERS |
272 | for p in (bb.data.getVar('PREFERRED_PROVIDERS', localdata, 1) or "").split(): | 279 | for p in (bb.data.getVar('PREFERRED_PROVIDERS', localdata, 1) or "").split(): |
273 | (providee, provider) = p.split(':') | 280 | try: |
281 | (providee, provider) = p.split(':') | ||
282 | except: | ||
283 | bb.msg.error(bb.msg.domain.Provider, "Malformed option in PREFERRED_PROVIDERS variable: %s" % p) | ||
284 | continue | ||
274 | if providee in self.status.preferred and self.status.preferred[providee] != provider: | 285 | if providee in self.status.preferred and self.status.preferred[providee] != provider: |
275 | bb.msg.error(bb.msg.domain.Provider, "conflicting preferences for %s: both %s and %s specified" % (providee, provider, self.status.preferred[providee])) | 286 | bb.msg.error(bb.msg.domain.Provider, "conflicting preferences for %s: both %s and %s specified" % (providee, provider, self.status.preferred[providee])) |
276 | self.status.preferred[providee] = provider | 287 | self.status.preferred[providee] = provider |