[oe-commits] [openembedded-core] 09/25: toaster.bbclass: Ignore some dependencies in toaster_buildhistory_dump()

[git at git.openembedded.org]

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

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

commit 80c117f46442ef442e34b7681ed3688789f505ac
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Tue Aug 29 23:21:05 2017 +0200

    toaster.bbclass: Ignore some dependencies in toaster_buildhistory_dump()
    
    When using RPM, depends.dot may contain dependencies such as
    "/bin/sh", which will confuse _toaster_load_pkgdatafile(). Ignore
    them. While at it, also ignore dependencies that contain parentheses,
    e.g., "libc.so.6(GLIBC_2.7)".
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/toaster.bbclass | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index fbf463b..6cef0b8 100644
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -279,6 +279,14 @@ python toaster_buildhistory_dump() {
                     dependsname = m.group('dep')
                     deptype = 'recommends' if m.group('rec') else 'depends'
 
+                    # If RPM is used for packaging, then there may be
+                    # dependencies such as "/bin/sh", which will confuse
+                    # _toaster_load_pkgdatafile() later on. While at it, ignore
+                    # any dependencies that contain parentheses, e.g.,
+                    # "libc.so.6(GLIBC_2.7)".
+                    if dependsname.startswith('/') or '(' in dependsname:
+                        continue
+
                     if not pname in images[target]:
                         images[target][pname] = {'size': 0, 'depends' : []}
                     if not dependsname in images[target]:

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