diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/base.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/license.bbclass | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index bd0d6e3ca6..3014767b8a 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -100,8 +100,8 @@ def get_lic_checksum_file_list(d): | |||
100 | # We only care about items that are absolute paths since | 100 | # We only care about items that are absolute paths since |
101 | # any others should be covered by SRC_URI. | 101 | # any others should be covered by SRC_URI. |
102 | try: | 102 | try: |
103 | path = bb.fetch.decodeurl(url)[2] | 103 | (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(url) |
104 | if not path: | 104 | if method != "file" or not path: |
105 | raise bb.fetch.MalformedUrl(url) | 105 | raise bb.fetch.MalformedUrl(url) |
106 | 106 | ||
107 | if path[0] == '/': | 107 | if path[0] == '/': |
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index d353110464..82fab9c63b 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -482,7 +482,9 @@ def find_license_files(d): | |||
482 | 482 | ||
483 | for url in lic_files.split(): | 483 | for url in lic_files.split(): |
484 | try: | 484 | try: |
485 | (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url) | 485 | (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(url) |
486 | if method != "file" or not path: | ||
487 | raise bb.fetch.MalformedUrl() | ||
486 | except bb.fetch.MalformedUrl: | 488 | except bb.fetch.MalformedUrl: |
487 | bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), url)) | 489 | bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), url)) |
488 | # We want the license filename and path | 490 | # We want the license filename and path |