From 023e9b2685c4d3d8296f96f048217c8c89327ee3 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 15 Jul 2015 16:48:00 -0700 Subject: recipetool: appendsrcfile: fix duplicate SRC_URI check (From OE-Core rev: e9986529d15220a8482f5a7a2fdbe86110ee35b5) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- scripts/lib/recipetool/append.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'scripts') 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)) -- cgit v1.2.3-54-g00ecf