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:44 +0100 |
commit | 3c8da7d5bcfebadf9f0cbc75d37aa02850f93afe (patch) | |
tree | 8f8bdbeec3d8388367b23d925fdf61fbc668d646 /meta/classes/toaster.bbclass | |
parent | 3e49cee7e88a732ae892df5e6c88c849e2785dbd (diff) | |
download | poky-3c8da7d5bcfebadf9f0cbc75d37aa02850f93afe.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: 5413e56205a9f48d8c3e419d8da468c60f5aa348)
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>
Diffstat (limited to 'meta/classes/toaster.bbclass')
-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 } |