sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Christopher Larson 2015-07-15 16:48:00 -07:00 committed by Richard Purdie
parent 51ae4918a0
commit 023e9b2685
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/lib/recipetool/append.py
View File

@ -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))