[2/6] meta/lib/oe/sbom30.py: correct typo

Message ID	20241026032519.1968518-3-hongxu.jia@windriver.com
State	Accepted, archived
Commit	038dcdca760404a44e0bcef389b4b60903f14a1f
Headers	show Return-Path: <hongxu.jia@eng.windriver.com> ip: 205.220.166.238, mailfrom: prvs=002900eeaf=hongxu.jia@windriver.com) From: Hongxu Jia <hongxu.jia@windriver.com> To: <openembedded-core@lists.openembedded.org> CC: <JPEWhacker@gmail.com> Subject: [oe-core][PATCH 2/6] meta/lib/oe/sbom30.py: correct typo Date: Fri, 25 Oct 2024 20:25:15 -0700 Message-ID: <20241026032519.1968518-3-hongxu.jia@windriver.com> In-Reply-To: <20241026032519.1968518-1-hongxu.jia@windriver.com> References: <20241026032519.1968518-1-hongxu.jia@windriver.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain
Series	Support SPDX include source for work-share directory \| expand [RR,NULL,0/6] Support SPDX include source for work-share directory [1/6] meta/lib/oe/sbom30.py: correct python list comprehension [2/6] meta/lib/oe/sbom30.py: correct typo [3/6] meta/lib/oe/sbom30.py: create hasDeclaredLicense relationship conditionally [4/6] meta/lib/oe/spdx30_tasks.py: improve debug log in add_package_files [5/6] create-spdx-{2.2,3.0}: support SPDX include source for work-share directory [6/6] Add SPDX 3.0 include source case for work-share

Message ID

20241026032519.1968518-3-hongxu.jia@windriver.com

State

Accepted, archived

Commit

038dcdca760404a44e0bcef389b4b60903f14a1f

Headers

From: Hongxu Jia <hongxu.jia@windriver.com>
To: <openembedded-core@lists.openembedded.org>
CC: <JPEWhacker@gmail.com>
Subject: [oe-core][PATCH 2/6] meta/lib/oe/sbom30.py: correct typo
Date: Fri, 25 Oct 2024 20:25:15 -0700
Message-ID: <20241026032519.1968518-3-hongxu.jia@windriver.com>
In-Reply-To: <20241026032519.1968518-1-hongxu.jia@windriver.com>
References: <20241026032519.1968518-1-hongxu.jia@windriver.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain

Series

Support SPDX include source for work-share directory | expand

Comments

Joshua Watt Oct. 28, 2024, 7:47 p.m. UTC | #1

LGTM, thanks

Reviewed-by: Joshua Watt <JPEWhacker@gmail.com>

On Fri, Oct 25, 2024 at 9:25 PM Hongxu Jia <hongxu.jia@windriver.com> wrote:
>
> The isinstance expected 2 arguments
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>  meta/lib/oe/sbom30.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/lib/oe/sbom30.py b/meta/lib/oe/sbom30.py
> index 73a957a20c..f4cc1f49dd 100644
> --- a/meta/lib/oe/sbom30.py
> +++ b/meta/lib/oe/sbom30.py
> @@ -631,7 +631,7 @@ class ObjectSet(oe.spdx30.SHACLObjectSet):
>          sha256_hash = bb.utils.sha256_file(path)
>
>          for f in self.by_sha256_hash.get(sha256_hash, []):
> -            if not isinstance(oe.spdx30.software_File):
> +            if not isinstance(f, oe.spdx30.software_File):
>                  continue
>
>              if purposes:
> --
> 2.25.1
>

diff --git a/meta/lib/oe/sbom30.py b/meta/lib/oe/sbom30.py
index 73a957a20c..f4cc1f49dd 100644
--- a/meta/lib/oe/sbom30.py
+++ b/meta/lib/oe/sbom30.py
@@ -631,7 +631,7 @@  class ObjectSet(oe.spdx30.SHACLObjectSet):
         sha256_hash = bb.utils.sha256_file(path)
 
         for f in self.by_sha256_hash.get(sha256_hash, []):
-            if not isinstance(oe.spdx30.software_File):
+            if not isinstance(f, oe.spdx30.software_File):
                 continue
 
             if purposes:

[2/6] meta/lib/oe/sbom30.py: correct typo

Commit Message

Comments

Patch