diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-09-25 14:41:36 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 12:00:25 +0100 |
| commit | ea031f05a5d5bd912e9dc757b2c3976cda67c9eb (patch) | |
| tree | 50f27a9a94f2e94433f2b524e3a413a6365f4d05 | |
| parent | 5cc44fe4fd94dcdab06d5cc0b2fd4205ed981482 (diff) | |
| download | poky-ea031f05a5d5bd912e9dc757b2c3976cda67c9eb.tar.gz | |
distrodata: handle recipes with empty or absent SRC_URI in checkpkg()
(From OE-Core rev: ea7cd81d6d1d4d00553cd475623af0d24f5ea84f)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/distrodata.bbclass | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index 4168e43849..e6eb3f32b3 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass | |||
| @@ -272,9 +272,10 @@ python do_checkpkg() { | |||
| 272 | 272 | ||
| 273 | """first check whether a uri is provided""" | 273 | """first check whether a uri is provided""" |
| 274 | src_uri = d.getVar('SRC_URI', True) | 274 | src_uri = d.getVar('SRC_URI', True) |
| 275 | if not src_uri: | 275 | if src_uri: |
| 276 | return | 276 | uri_type, _, _, _, _, _ = decodeurl(src_uri) |
| 277 | uri_type, _, _, _, _, _ = decodeurl(src_uri) | 277 | else: |
| 278 | uri_type = "none" | ||
| 278 | 279 | ||
| 279 | """initialize log files.""" | 280 | """initialize log files.""" |
| 280 | logpath = d.getVar('LOG_DIR', True) | 281 | logpath = d.getVar('LOG_DIR', True) |
| @@ -354,7 +355,10 @@ python do_checkpkg() { | |||
| 354 | elif cmp == 0: | 355 | elif cmp == 0: |
| 355 | pstatus = "MATCH" | 356 | pstatus = "MATCH" |
| 356 | 357 | ||
| 357 | psrcuri = psrcuri.split()[0] | 358 | if psrcuri: |
| 359 | psrcuri = psrcuri.split()[0] | ||
| 360 | else: | ||
| 361 | psrcuri = "none" | ||
| 358 | pdepends = "".join(pdepends.split("\t")) | 362 | pdepends = "".join(pdepends.split("\t")) |
| 359 | pdesc = "".join(pdesc.split("\t")) | 363 | pdesc = "".join(pdesc.split("\t")) |
| 360 | no_upgr_reason = d.getVar('RECIPE_NO_UPDATE_REASON', True) | 364 | no_upgr_reason = d.getVar('RECIPE_NO_UPDATE_REASON', True) |
