[oe-commits] [openembedded-core] 22/23: toaster.bbclass: Fix error when toaster is used to monitor a build

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 982fe050208db92c8382a769035035e74f4ed217
Author: Mark Hatle <mark.hatle at kernel.crashing.org>
AuthorDate: Tue Jan 21 18:27:01 2020 -0600

    toaster.bbclass: Fix error when toaster is used to monitor a build
    
    The error being corrected looks like:
    
    File: '/home/jenkins/workspace/OEBuild/build-32/oe-core/meta/classes/toaster.bbclass', lineno: 130, function: toaster_package_dumpdata
         0126:    lpkgdata = {}
         0127:    datadir = os.path.join(pkgdatadir, 'runtime')
         0128:
         0129:    # scan and send data for each generated package
     *** 0130:    for datafile in os.listdir(datadir):
         0131:        if not datafile.endswith('.packaged'):
         0132:            lpkgdata = _toaster_load_pkgdatafile(datadir, datafile)
         0133:            # Fire an event containing the pkg data
         0134:            bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d)
    Exception: FileNotFoundError: [Errno 2] No such file or directory: '/home/jenkins/workspace/OEBuild/builds/build-32/tmp-glibc/work/core2-64-oe-linux/puzzles/2_0.0+gitAUTOINC+c6e0161dd4-r0/pkgdata/runtime'
    
    There must be a small window before the data is available, but while the monitoring is on-going.
    
    Signed-off-by: Mark Hatle <mark.hatle at kernel.crashing.org>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/toaster.bbclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index 6a65ecb..9518ddf 100644
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -126,11 +126,12 @@ def _toaster_dumpdata(pkgdatadir, d):
     datadir = os.path.join(pkgdatadir, 'runtime')
 
     # scan and send data for each generated package
-    for datafile in os.listdir(datadir):
-        if not datafile.endswith('.packaged'):
-            lpkgdata = _toaster_load_pkgdatafile(datadir, datafile)
-            # Fire an event containing the pkg data
-            bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d)
+    if os.path.exists(datadir):
+        for datafile in os.listdir(datadir):
+            if not datafile.endswith('.packaged'):
+                lpkgdata = _toaster_load_pkgdatafile(datadir, datafile)
+                # Fire an event containing the pkg data
+                bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d)
 
 python toaster_package_dumpdata() {
     _toaster_dumpdata(d.getVar('PKGDESTWORK'), d)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.