]> code.ossystems Code Review - openembedded-core.git/commitdiff
recipetool: appendsrcfile: fix duplicate SRC_URI check
authorChristopher Larson <chris_larson@mentor.com>
Wed, 15 Jul 2015 23:48:00 +0000 (16:48 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 22 Jul 2015 22:25:01 +0000 (23:25 +0100)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/recipetool/append.py

index a2133f7a89843b7bf0a8612035600bf7001cd542..0997f82b72d858f85162d7c4a25841fa251ef3ef 100644 (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))