[oe-commits] Christopher Larson : recipetool: appendsrcfile: fix duplicate SRC_URI check

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e9986529d15220a8482f5a7a2fdbe86110ee35b5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e9986529d15220a8482f5a7a2fdbe86110ee35b5

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Wed Jul 15 16:48:00 2015 -0700

recipetool: appendsrcfile: fix duplicate SRC_URI check

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/lib/recipetool/append.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index a2133f7..0997f82 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))