diff options
Diffstat (limited to 'bitbake/bin/bitbake-worker')
-rwxr-xr-x | bitbake/bin/bitbake-worker | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index 6c37967513..7765b9368b 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker | |||
@@ -150,11 +150,15 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha | |||
150 | 150 | ||
151 | taskdep = workerdata["taskdeps"][fn] | 151 | taskdep = workerdata["taskdeps"][fn] |
152 | if 'umask' in taskdep and taskname in taskdep['umask']: | 152 | if 'umask' in taskdep and taskname in taskdep['umask']: |
153 | umask = taskdep['umask'][taskname] | ||
154 | elif workerdata["umask"]: | ||
155 | umask = workerdata["umask"] | ||
156 | if umask: | ||
153 | # umask might come in as a number or text string.. | 157 | # umask might come in as a number or text string.. |
154 | try: | 158 | try: |
155 | umask = int(taskdep['umask'][taskname],8) | 159 | umask = int(umask, 8) |
156 | except TypeError: | 160 | except TypeError: |
157 | umask = taskdep['umask'][taskname] | 161 | pass |
158 | 162 | ||
159 | dry_run = cfg.dry_run or dry_run_exec | 163 | dry_run = cfg.dry_run or dry_run_exec |
160 | 164 | ||