From patchwork Tue Nov 4 08:33:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 73583 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F461CCFA00 for ; Tue, 4 Nov 2025 08:34:11 +0000 (UTC) Received: from MRWPR03CU001.outbound.protection.outlook.com (MRWPR03CU001.outbound.protection.outlook.com [40.107.130.118]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.13398.1762245230231928511 for ; Tue, 04 Nov 2025 00:33:53 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=sAMf2dIJ; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: vaisala.com, ip: 40.107.130.118, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ejaAIaa5HdNKd3ZYnFBMA6Qe4rqMfROPOv6XEoQrw5WQGIF/1LMi4taHH9PXiKoMYKR+QDUrPMAkxcmGXQZWIOwk7xL69ZbC/KvMnL4+Y0C+GIh6jyoBOSULTKvnB2Fa6IGzQN6FweH288WsN6U1f2HJQNkNXAKaSWdsZhcGew+kssZmx39tgq2pcKr+Beq164WmhLg6x4uYPQxUqwr1tKEzVDmvmoI5Ejw/tBxI0sKDHn8dHKEV2+Oy3OQv//4YuQltPzSFVyEQQC+6yA2Zzbrw+q9n1CO84N8MTq/xcsxEsyBueDDq8JTgaJIsUui/Rze4hMltRLHcv3jtxNKjkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0YvBv20ZeHs5+m5oaxJYZuiXU3tkg8OKp7HTswJdha0=; b=mOvrqnfSUzJ5A8y5nlU40uDpmDTDw6A4kLUCwH+ugrFZUGYyrR02G8ZBlsmUAUx3Q4MgPaK1LlPY1C1zCSRdPmWcfpKeA9AXDbWkK2NpKSGx6BeqZj4MnmeCF7DqT/difZp0tlTSPJRj10higolo8FmLBAr67Mzi10r655vyJwaVMMK++Kf3T3yp69fjPFCZtfvtEsh+cir3IlUnZQjmH94H4y+TP4Cvk+Dg//kBY+INJ6e9RLSarXMMMHOcvqaIlduwg0M6ufZLa/mtntHM0sDmQVhia85xy6fq3tyeN+Ja05+Yv73scvVibejgeFlbgoAFDDypEjB32HENiyxA0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0YvBv20ZeHs5+m5oaxJYZuiXU3tkg8OKp7HTswJdha0=; b=sAMf2dIJ34/IHklfVWAd1J7tqVf0ITS8uvpkMUjT+MlOLmccmCFXZMO+LXW4ozyMUURAqLQrzJobusrDJHpr07X8/+P1P0ZJnVMr47du2urbsNqElgp5GR/+wUCk/ejQyHhliV2h4foJt5qlUaLM3AUu1RmG3TmDqMuxhFG5rh0flePbJwcp6+iPJIlIuPg+sqPSwMG7Rt8pnhP1QmNN5matHBZ9VvNCJCz4RgYKUZJ/4aFcy2ReYLt+JOwP5fHJRpXJehRkflJoLScU+wVUpcDiSfNzSCCR4jdQfC4iooml1iU5nnSBWGSr3Cre3nxoFZ6U9q+nawrWCqwVnHiQDg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by PAXPR06MB7405.eurprd06.prod.outlook.com (2603:10a6:102:de::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9275.16; Tue, 4 Nov 2025 08:33:45 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc%5]) with mapi id 15.20.9275.015; Tue, 4 Nov 2025 08:33:45 +0000 From: Niko Mauno To: openembedded-core@lists.openembedded.org CC: ross.burton@arm.com, rybczynska@gmail.com, peter.marko@siemens.com, Niko Mauno Subject: [PATCH v2 2/5] cve-update-db-native: pycodestyle fixes Date: Tue, 4 Nov 2025 08:33:30 +0000 Message-ID: <20251104083333.814331-2-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251104083333.814331-1-niko.mauno@vaisala.com> References: <20251104083333.814331-1-niko.mauno@vaisala.com> X-ClientProxiedBy: GV2PEPF0000384D.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1:0:9:0:f) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|PAXPR06MB7405:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e974eef-97a7-430d-97a9-08de1b7cde45 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: aBdOz0v7A1hRujYJQF8kOyJA+phEElAGjFeUxdmHdgsCTyvBiGQJjE95wwIO3eokqOQbyI6DVy49nzte+DuVmXGqCe3MCNkyZe00yhHXxba7/ePAXQzhx7yw5hFP/RG1Truez9yFuA/GsLm26kiy6MYU1w2DHhuDIzK9HGj8M4ute5qJsBSELck/TgieIDIRISgYs341OXiPNtlWZ3Rk2eJ4ionUAzNJOkcU2Rd37U1UUFac6s7SnvullCV6vwlN+vvlafBTYt6nk8v5MD02uSXCdPMrygLhih4ZuwPGpajRSIvW1QJM7sQ1w8B6usAaz18vIrsZXS3Q7yXtqTKs4Ce7eZNI0JEq7TotyLT3Ycpp+zm62sII8xJeLoTz7rymv3V6n6qVJfAyYO4oFrGVg+FyTdypOBCjTC2ABLDxdvmpF5MRyK0CDxbYNABsmdEkBKOjEgRd8VCyfBqDHsUHR1FqEJWW8QJWK8sTXQAaUuG9zVxzmfGALmz4RYG1/vLotynou/sPatpNbElz98CLxsOTmrAOy4leX35kA3bTNoVc59YeOaRqMU5suHDkzyLyae5OFaaDLXPPAE6OOseoTF46DHpRP+JutBw8UmMYgnmjt//9RuX6X4rw6GNs7CPSBp4zqoMJD0o0qWxotShvN7hOaAj29ZyJx1+L4aLrEGY0SKyF8p3ro2xIP0axIZJP0ZOLW579F0wYR2i97aVybHNKdRWKBpz+Q+/YUtPQoc946rZpS5OIv/IH8QHdFZcBPCp/kCUak9lks9NYBNGyoQRKU6BO9WPUvHBjKbnwkgcCGRTrkLsbYS5cngt45Jq6JgHdpINa9oPlNKLuSAH+k6GoTdX0LFsUUtgMJIGICWVoCICzjrKsZUXOcLaIYaGFP1PKfjVNtAa7WR3YJ2suYWdNky0bZD1kAKywk+FbINiwd1VDByvUcSZp1W5E1gAG4vyqLg1kmVFP72J8VdwzPtxq6vAV2YWCbm27w611ntvW+cP6j6BhpPMc++enxqZABSiMRhWIxos8QZqEzClezFy07+ZRyzcFlad78a8SIyNGusOg4J5Ybx+O7p94c+tTag0aHnOk9LphrmpOBmFb0mFrD1l0OKwIPqAnGB2WV/XodT6JIs/4jpmFPnMp2MN1Fj8/W8zDbtB/jaGHtc/gw2L25sKNaEtu5nishUhT6Zteo8Kh1V9uaabrTUW1e8xyOqCUHyLlyS0K0GZjSgug2xXnwtgeQNDrHwSIyRcXjQAalAN2nyorXLPsZzrNvte8e+X0oF1IXc/qsqJ179VDkUp6rH+lVjQu8+bq8+PU+QyCp8Aq7w4LeW5lM9EfXXlWQsfEw6Hwg04vVOJzBTCI1oR8VPQP3zvo1KQhLx7mWS8kaViq2JL4h/pruRJEp1Lq+Gk6PoUZtwb60xj9wxTd//wGBA7U/sA8aSzlwhB7h+BukNJHwJ2x7rm9ZejWfFB8ud2TGFYkFCZOjTLoUGNSd/nhTb0eL29u+YzHtxpXU2++neaAse1BfBKt3B2etHRN X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0M1lJ0QsGtkzybZpa3Ua6i0Xtw/usACb0fB3WOuWgMmVCmtuRb8JuBxAZ0qfb2ud643+X9d0P3WQw8PnBD97uBmbtFyF6TNcaMQ+eBhXtLIZHSYDyew9BOCNL1BsI1ld4+thTMlcmpybJU7Asw9AEwZPyMdspqpBeGngrDvQGHOnhso859zydjWDoQwCa5uqGhj8btWj7s4FDnrkMg0kBNHElQ40DTkyEKTUiGi2klLxN7jpDaaRl6yLQwWo/yqIBep05pvL22ex/DyPtWF92r5zw5S/7gkeeJuKbGtRgo1LDM2ybCra+ykHLCC5h6naWmGyi5peMsFEyuUFH0AcmWdersEOC3NXnfoh7NB7EVW3FNQtgmyyV7smrZiqbuejQyFsbESRyDbsnoUn07x0kMbAnQsCLK7vtxXTkSXZ9XYQz/G8jIEL5KoJmKRJH3SmjWgAR9gjFYlAuU8X09Q92tM6daZbJQAvCaMeOtUl9aThiMZ4AiM9hIOabZoGcbs2/AJNew0Dew84ZKAxIGTh4DseB0kLtfHF7yj9WjyRkQtVy3aJuaMfhO+Hk9bDGVqn3wG8ybL5H7qlZUo7QVTeeiX2OI+cF6O+RhsV5PtzCzkzOGL2pjsi22+5UrxHvZrZkDUYEpZXMssYRNcdO5HKFiDd+ErmRE92TBfRc641ej6wIQJO5EPy0euioosQIwMNXMIgHrDJbrHzERcbdFxwO9ajW/+I3MY4hwyC1eEJx2p6CKUDvP79G2Y2BZ9gV6hpotp7toY5Fsa0xbBnf38JX43dgphzeyReVDfD1+PtORc/D2l8p3+FUUoSqurRJxADq53CeMViMRb0kvNfYHNerq6IclUig2EBat+K2V1qxu8rdIqcvg39IBfvH6cE3jBEMj0pT2qXQdi5S90lEIghzH3AMFiv2mdhrCs7h8sFiJRpd0VkXm0eEbeWois9wjepvty0STJhKipcoaQgbspxmpNQvKwQk+H2cCuwQ87c96SQvWO6NB4gfmQ3ESp4s/aLaJQ+7s2ogBpHFDvB7rKZvZatJnbHSGVbmvIKKC7pCfctRu/m5deOW7ghRx2f3LGUDhKgkZWThZ05xVaYOaaBTrJCNGKHuy5lbSN8F5hpvrEmLKBI4S/s25FgwWLQLna35G2vLRbIjxYPshnb3A75h4s1W+FkqSwgIrlwOtZa3YB0ipfosRFoD1gEzxmzKZ04I8DRL+Riz+QCRh2YHlqXROwlY/WQGu6Oej0DyN69a7R2LZzRo+gIHrexN6LCwdsdWrN4ZG4JybQ1aKJDx5U4kzWbEJEOnUUa7Cb3TpuoaUKX69tZthZRvAMdZTOKeK31VpaqYAp5E9YTTUkRvL1YbDP+E6D5isQtEe7g/UqVExSnTYxz6f/+4XkKmXF+eG1+I8F1qKoJSD0LDS68ywYpgZJraLA8vjgMYzj3wbZpamZFd7QQNgWtL6PQ8IKzLEVx4D1WyMBcDdzGmYGUFh9BmhaXqlF+g73rTLQH0VN7TgceVE7JnFlCuWWJO0H0/MGTAMCc38ONxV2DmIIsr9howUfgy3R6R6Pp1zWkfKQE0aYF0p5uSIQhFDgRJ79tDpaccfFnWq4ka3ynSNIBubitDA== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e974eef-97a7-430d-97a9-08de1b7cde45 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2025 08:33:45.4302 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sfnWhNdelnocj2PocI6VqRrbndqP55rxDnmZNA/IzJTHznNugd1shZ57cyDSj17wsmdBccOjX/BEri6Y3TMy7Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR06MB7405 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Nov 2025 08:34:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/225713 Fixes following pycodestyle complaints: cve-update-db-native.bb:80:39: E712 comparison to True should be 'if cond is True:' or 'if cond:' cve-update-db-native.bb:128:20: E401 multiple imports on one line cve-update-db-native.bb:130:18: E401 multiple imports on one line cve-update-db-native.bb:171:21: E741 ambiguous variable name 'l' cve-update-db-native.bb:335:26: E225 missing whitespace around operator cve-update-db-native.bb:344:12: E713 test for membership should be 'not in' cve-update-db-native.bb:347:12: E713 test for membership should be 'not in' Also leaves out a redundant 'gzip' import in update_db_file(). Signed-off-by: Niko Mauno --- meta/recipes-core/meta/cve-update-db-native.bb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 713c73e574..3a6dc95580 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -77,7 +77,7 @@ python do_fetch() { if os.path.exists(db_file): shutil.copy2(db_file, db_tmp_file) - if update_db_file(db_tmp_file, d) == True: + if update_db_file(db_tmp_file, d): # Update downloaded correctly, can swap files shutil.move(db_tmp_file, db_file) else: @@ -136,9 +136,11 @@ def update_db_file(db_tmp_file, d): """ Update the given database file """ - import bb.utils, bb.progress + import bb.progress + import bb.utils from datetime import date - import urllib, gzip, sqlite3 + import sqlite3 + import urllib YEAR_START = 2002 cve_socket_timeout = int(d.getVar("CVE_SOCKET_TIMEOUT")) @@ -167,8 +169,8 @@ def update_db_file(db_tmp_file, d): return False if response: - for l in response.read().decode("utf-8").splitlines(): - key, value = l.split(":", 1) + for line in response.read().decode("utf-8").splitlines(): + key, value = line.split(":", 1) if key == "lastModifiedDate": last_modified = value break @@ -332,7 +334,7 @@ def get_metric_entry(metric): secondaries = [c for c in metric if c['type'] == "Secondary"] if len(primaries) > 0: return primaries[0] - elif len(secondaries)>0: + elif len(secondaries) > 0: return secondaries[0] return None @@ -341,10 +343,10 @@ def update_db_fkie(conn, jsondata): root = json.loads(jsondata) for elt in root['cve_items']: - if not 'vulnStatus' in elt or elt['vulnStatus'] == 'Rejected': + if 'vulnStatus' not in elt or elt['vulnStatus'] == 'Rejected': continue - if not 'configurations' in elt: + if 'configurations' not in elt: continue accessVector = None