diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-04-11 17:40:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-19 11:04:40 +0100 |
commit | a2f39919c17a17091e105131b67cb8496450497d (patch) | |
tree | 785f5f4c49dc89e3c4468979353c8e9354870e27 | |
parent | 2cae5f78ad2982c7ca0c22c085b71a1d2184a1b0 (diff) | |
download | poky-a2f39919c17a17091e105131b67cb8496450497d.tar.gz |
toaster.bbclass: do not fail on non-existent files
Toaster may look up inexistent file paths in the build history
for packages that have been referenced but not built.
This triggers a failure, and this patch recovers by deleting
the reference to the non-built packages.
[YOCTO #6063]
(From OE-Core rev: 6bc4a0311cc3cd3f696d9dbca8fc0ef4e3bc340b)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/toaster.bbclass | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index d2fa82d730..4244b2ca7f 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass | |||
@@ -288,7 +288,15 @@ python toaster_buildhistory_dump() { | |||
288 | 288 | ||
289 | for pname in images[target]: | 289 | for pname in images[target]: |
290 | if not pname in allpkgs: | 290 | if not pname in allpkgs: |
291 | allpkgs[pname] = _toaster_load_pkgdatafile("%s/runtime-reverse/" % pkgdata_dir, pname) | 291 | try: |
292 | pkgdata = _toaster_load_pkgdatafile("%s/runtime-reverse/" % pkgdata_dir, pname) | ||
293 | except IOError as err: | ||
294 | if err.errno == 2: | ||
295 | # We expect this e.g. for RRECOMMENDS that are unsatisfied at runtime | ||
296 | continue | ||
297 | else: | ||
298 | raise | ||
299 | allpkgs[pname] = pkgdata | ||
292 | 300 | ||
293 | 301 | ||
294 | data = { 'pkgdata' : allpkgs, 'imgdata' : images, 'filedata' : files } | 302 | data = { 'pkgdata' : allpkgs, 'imgdata' : images, 'filedata' : files } |