diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2015-07-15 16:48:00 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-22 23:25:01 +0100 |
| commit | e9986529d15220a8482f5a7a2fdbe86110ee35b5 (patch) | |
| tree | 34ae8329301c0bf995e5138e5795013f6b95e014 | |
| parent | f6bf07f2247b316421b3945d9d21ed8cbb300bda (diff) | |
| download | openembedded-core-e9986529d15220a8482f5a7a2fdbe86110ee35b5.tar.gz openembedded-core-e9986529d15220a8482f5a7a2fdbe86110ee35b5.tar.bz2 openembedded-core-e9986529d15220a8482f5a7a2fdbe86110ee35b5.zip | |
recipetool: appendsrcfile: fix duplicate SRC_URI check
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/recipetool/append.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index a2133f7a89..0997f82b72 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py @@ -349,7 +349,7 @@ def appendsrc(args, files, rd): for uri in src_uri: simple_uri = bb.fetch.URI(uri) simple_uri.params = {} - simplified[simple_uri] = uri + simplified[str(simple_uri)] = uri copyfiles = {} extralines = [] @@ -365,9 +365,10 @@ def appendsrc(args, files, rd): simple = bb.fetch.URI(source_uri) simple.params = {} - if simple in simplified: - existing = simplified[simple] - if uri != existing: + simple_str = str(simple) + if simple_str in simplified: + existing = simplified[simple_str] + if source_uri != existing: logger.warn('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing)) else: logger.warn('{0!r} is already in SRC_URI, not adding'.format(source_uri)) |