diff options
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/utils.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 82dab6b542..d032ab299e 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
| @@ -157,9 +157,12 @@ def explode_dep_versions(s): | |||
| 157 | elif inversion and i.endswith(')'): | 157 | elif inversion and i.endswith(')'): |
| 158 | inversion = False | 158 | inversion = False |
| 159 | lastver = lastver + " " + (i[:-1] or "") | 159 | lastver = lastver + " " + (i[:-1] or "") |
| 160 | if lastdep in r and r[lastdep] and r[lastdep] != lastver: | ||
| 161 | raise ValueError("Error, item %s appeared in dependency string '%s' multiple times with different values. explode_dep_versions cannot cope with this." % (lastdep, s)) | ||
| 160 | r[lastdep] = lastver | 162 | r[lastdep] = lastver |
| 161 | elif not inversion: | 163 | elif not inversion: |
| 162 | r[i] = None | 164 | if not (i in r and r[i]): |
| 165 | r[i] = None | ||
| 163 | lastdep = i | 166 | lastdep = i |
| 164 | lastver = "" | 167 | lastver = "" |
| 165 | elif inversion: | 168 | elif inversion: |