[oe-commits] Alexander Kanavin : distrodata: handle recipes with empty or absent SRC_URI in checkpkg()

git at git.openembedded.org git at git.openembedded.org
Sat Sep 26 17:14:30 UTC 2015


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

Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
Date:   Fri Sep 25 14:41:36 2015 +0300

distrodata: handle recipes with empty or absent SRC_URI in checkpkg()

Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/distrodata.bbclass | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 4168e43..e6eb3f3 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -272,9 +272,10 @@ python do_checkpkg() {
 
         """first check whether a uri is provided"""
         src_uri = d.getVar('SRC_URI', True)
-        if not src_uri:
-                return
-        uri_type, _, _, _, _, _ = decodeurl(src_uri)
+        if src_uri:
+            uri_type, _, _, _, _, _ = decodeurl(src_uri)
+        else:
+            uri_type = "none"
 
         """initialize log files."""
         logpath = d.getVar('LOG_DIR', True)
@@ -354,7 +355,10 @@ python do_checkpkg() {
             elif cmp == 0:
                 pstatus = "MATCH"
 
-        psrcuri = psrcuri.split()[0]
+        if psrcuri:
+            psrcuri = psrcuri.split()[0]
+        else:
+            psrcuri = "none"
         pdepends = "".join(pdepends.split("\t"))
         pdesc = "".join(pdesc.split("\t"))
         no_upgr_reason = d.getVar('RECIPE_NO_UPDATE_REASON', True)



More information about the Openembedded-commits mailing list