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-23 08:48:41 +0100 |
commit | 023e9b2685c4d3d8296f96f048217c8c89327ee3 (patch) | |
tree | a8c4804831af2e1c47dcbe785d842c4281662376 | |
parent | 51ae4918a0c6b3d94cb991521d0e5c08bb08dffd (diff) | |
download | poky-023e9b2685c4d3d8296f96f048217c8c89327ee3.tar.gz |
recipetool: appendsrcfile: fix duplicate SRC_URI check
(From OE-Core rev: e9986529d15220a8482f5a7a2fdbe86110ee35b5)
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): | |||
349 | for uri in src_uri: | 349 | for uri in src_uri: |
350 | simple_uri = bb.fetch.URI(uri) | 350 | simple_uri = bb.fetch.URI(uri) |
351 | simple_uri.params = {} | 351 | simple_uri.params = {} |
352 | simplified[simple_uri] = uri | 352 | simplified[str(simple_uri)] = uri |
353 | 353 | ||
354 | copyfiles = {} | 354 | copyfiles = {} |
355 | extralines = [] | 355 | extralines = [] |
@@ -365,9 +365,10 @@ def appendsrc(args, files, rd): | |||
365 | 365 | ||
366 | simple = bb.fetch.URI(source_uri) | 366 | simple = bb.fetch.URI(source_uri) |
367 | simple.params = {} | 367 | simple.params = {} |
368 | if simple in simplified: | 368 | simple_str = str(simple) |
369 | existing = simplified[simple] | 369 | if simple_str in simplified: |
370 | if uri != existing: | 370 | existing = simplified[simple_str] |
371 | if source_uri != existing: | ||
371 | logger.warn('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing)) | 372 | logger.warn('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing)) |
372 | else: | 373 | else: |
373 | logger.warn('{0!r} is already in SRC_URI, not adding'.format(source_uri)) | 374 | logger.warn('{0!r} is already in SRC_URI, not adding'.format(source_uri)) |