From patchwork Fri Feb 7 12:46:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56845 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 45D27C0219D for ; Fri, 7 Feb 2025 12:47:22 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.73]) by mx.groups.io with SMTP id smtpd.web10.68437.1738932437003972275 for ; Fri, 07 Feb 2025 04:47:18 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=Mdw/H+1y; spf=pass (domain: weidmueller.com, ip: 52.101.70.73, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uWYc0vPZlTk7c4tnFh3LR2ZpafrmoPYcVnMqn3xdPTFKUQbBR9MVIbAuCyAXyowkZtnD6+hrR9jILYFqjPee9yO612MA93g4SGhxHiR+0ZsNdH4yfmvRMNC+Xx4hLbl5MbhKmC+lSoPzKJzH2BP4hHftgAnzoexelB7w41hz9oOdqP9bL3stai51v9+rCF1kF8IDyZ6T3RzYLeEQfvcmSxkshM8pR5aPKziHCgd38Mz1JLQdR37fhm15F/n3kvZx+d/AqTCe9LvKxQFzgrVbsAn+iqBj+27kpoEWYU191mHkABszr5HN0VAEHGPJqGqQXo9lp3jlNky8+9SLVIvY2Q== 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=BsT8uEQNnUeL3HsqM0qxMnYRib1WfzuXSCvQq4JhvEc=; b=DzIOJkF8F5QioejDJAv8PXfEN5D9HjRj9XdD/b5p7TTN6/1Ej15MVZ9KLOanhe3ZMmgAr4JZcIHjLwpNQ7kaEM/Gjcm9vm5xH9ZUikhXanWGMd65czqWKjqTuEkKeM01ux+r6gehBjnZZlAwZ8Msn6d4Jhl2nPXCEMGvgGGt2Jqv6ZQ7LHrHkm6xPe3zjgaTJEJAhFbrsuPgFrk/0IbqirP8u1fB2nd7CcjlghUy0lt7m8FOETMdzPBhhFYA2UVRnT54EyQo43thv7nY+TUaWJfRDcckdIbjJdWAk0ynyMTiTVJSdfT9YFRTbNz42/V1qGyR9CAU/R56qgO/Nx3Fnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BsT8uEQNnUeL3HsqM0qxMnYRib1WfzuXSCvQq4JhvEc=; b=Mdw/H+1yUsJb4epdRvq/cRunJCigfr13ZG8ID+ZbqTFbX34UGg83+31E73E9c0qJpFZxjlFE+FdkSbAnoLHHv1Mk/OtV5ayZsJwwsABiZYaFrN+Hk+JVtmQPPNSt/Q19s0mRCHYRstiCPtGwZj/gxhxU8hPZmmkY9gFSzaCLRqQQR/Hfxss3XZtI46Aoj1q8QzDq2Vh22OzaIB/p36iw6d55mPFrHpom6S6atRUudMM7Sao+QJb+Le6zrYwNwNWY0fM9mR/ICIYne3Xz/6OEfGT8CxYsSr6p53adDwVTwjiZPA5imomHGpjhk685P7t5hTz1imdZXxdM8Y5/tglQIw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:13 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:12 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 01/13] fetch2: do not decode user from file URI Date: Fri, 7 Feb 2025 13:46:49 +0100 Message-ID: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 267afe25-799b-4835-ed6f-08dd47758af9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: Ve3RItg2y9FuCMod3YChRQ2MVaCWVQBg3f10Ynp/cJh4Q/CZGCpGV5v4y6671LBIi/mVs1cfHLvNWrrq8eCoLTuTEmixduTVSsoLekswj5u63nrtRxIqZDGKSnUkcAMPMWTgOQsJJc76bQ2w/7sT86oXxjiobqDbwYyGS4oaGfI5nmBnQXJWmbsuKj8++DUbia/Ifrz7s2vsaRVZ6QHEjWBnQc7yklDAOxGJTdXbtWTlUBewektGrsjEe7Js6LyUcUHYWrjXDrlR4sTGwffzH2Fj7C5HzJhihOrB5X5fmARu8Ct1lkAcBlMVae6cFIWoB8FMhGlSO4pX52N2C1Tdcb1DHNqzoQ4TZqFrbA1eOAvh8WGF0Rx8Vu4U55TQIjOCd8mcr+f2tENCxLFlapprCa+2q8JUNwGbJ9kAYQ2EZGkUsaOW+xB++xKPoJIi7gtFMDd4uffj3iY81aDQYTFjMgdpegexG+I0o2/UfxotSmRvVkjyHoW4OI7TtrS6YAETW31EH87wCJ2ijVSYIjPmZcF4rAxysH746smPFxnQz1gXJxqq3qjUDR8hHH9LkUIFcg7Sg9k7Ff2O12FvZd6ADFLlw1dIPa/+iEPa6Ez9E4SEluGsGX0/iWlHL3PE1aY+Gf6hK9av4Nb5e2fjjoHvypvR+//Od5ijMyMZ38UNyK6ObaW7Kyfe1SN3g9EF18MGhoNZWPb7cHlTpTHgVZ0wp5SyN2HylA4LiakA/QSqrVMnD6M92OrD05DQoqmkAqTAOxjGchrImhNG7LwpQbALganjYnXEe9vjgZ4zr3I4gw7HDpHB79WW5Ke8v9TH93p143Jb5lkUFqBDQ4ejQqntX0BwzYHyybJsyRY356bk09ASH0c8jp1mc4d/HpI+ojdfmonIKk1yDlWfdch3x4Or+tDUVROLAuvxYTA/JD/kydiTRjsnOhDYw5OrJIWKB6l0bC/1xuBeeHGSUkr+Mj/PsdNOk8+UXS/6Rjk1V3pYaQL/hn+yZ/sfKKY/Y/Wt6LomSUpw5Ks2CSJGlq7oBlrsJdzDYRBCz/+1q/syx2BUTCeVEygsBKb4wzTUvIJwUVgns+zRu737VfwdX2L2SAPln+anSRQ1SlBtllmlmTDWOQbRd3dTrU1AmbOOOaDqB5M4PJd9zMYYoRqewRn1DTfjJB6bg4ZxCzxHFnIRWOTrw0hrQ9tTJcSXnCgoYlHQgo/EzCgo4h2LKKN+awzWUuJqQ+csnWveS0zpMG2M3nMoY05qwLg38NQvOcWlEiQ/esGMlESlL9q2jeWtgkpxXyhQg/0wKGZ/RGStcrzUub1fTC0taXNCRZzqqtP2sqeb0bj4umEtTqJ9hUvpzzwHjdJmxgsVFIaLSZ0CUI6DH47s/AG5Z/DzLXXGSC30I/r42xhU4MAHnkTgUNigSh2eutTh0Z73TraiMIa1Jza5LFGq/ARkxqvoPzwr8+h9yVVJDony X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4lRCfhU1xwPMl5xwjcsAVz3sKMEPIYmJa6M1d5sQImUMPLInepBp3azVr9O56sGBHae0GgONrHmdKdxtOvwedLGRmZUAmpR/nN/tswI/grGmkgdYRAqQ8wxEzmaLFLLLbkmPZKJyjbG2lpWj8y8sq8CMIDNwMmoYWYb2pJgYqjqqZm1LYbCZ1nLcdstGvNoa1Ir9Ah4LSe9D5lmxFtAzaEwAd2SviP/+qAv4HP5r3QAGCJQErdErgNq8acMWh+2yYOaBmNPP6szPMxGxyuJn7z7hKsDBbh+Vzq1YyjQ6nU8l2D8GclQyrKd1jbDMSRP83k0J7dSTf6IQIVvrOtLvFJ4Vnat05I4ZNZyhA8WwdZCtE4mOZJZ1l2gYdTtIDpe9tmEV9Q6G2keGfVmxIVN5KrvaMkNMnIyICCnHvL/JT0GVTFzMnCuvioHUj/Xto87YU6yFPbIapQsX83qSCBf64iG1TTe1tE0g5VipvXqjbUyieQ82RUBgFouqu1GsvNRd3itIvazwHmczd1k/xD5E13b9WiT1m5XkSo7Cry/gIwsO09ddJilMogGjGmuDRwCuRiyAirForn3RJmPFHkYS9wT4yqlWnBMpnB8zzhfvPHfczLFeUq63ll++ZpjljQPeSXfPE7DVn9xudmeQJYsJHYIK0ukNXsFmWZ2DtgUFBrgAsiyBL8wcNPirCyaRfe08yWHjvf1pGFtIaEr7mao+JlZGgQsYOtttfr1OOTCwxL7BPmn93FcLAcC+c45/jdn/h85WIJ4gwVRxgsEPMsDvYuqGOMJxNV1CCoLEzSXt0pDBShCFmOzFLrYz3Ku7SyCWVwHai5YmZTGlmoBy+hQnDrWyCKoqxZsz034rGzSL0J4NEHVe1tSNLHtfejSXKyQxtmaeRl3V2DNPMr+SgCPIcuIAiOuzKv3HmhFO7FMKzC7LodED/PvTKcanqejUndIqJZ9UrClA1gl1QwYIq8txCjYMmG7sbEWSiaDWP4HTzZ+MvAC70fhyzDlTI08beitJDLAKJXkDZk8ZTm/FcEXJKquz+zW3UfIBXe+3e0qrByyQet+KJex8uFK1MpFjBZFt6HPnZ554NuzbSq0BBdqUfn83taRXX+F41gvSS6VxyOxjdZL2wSUkONeVjUGX1ceTz6B50DusCfq60W2dJsV1rBB68DRrvSLd6HOzcvLkoGMUbUrlDMZHFsnHGej/vaMYbGLvsOxwMLF1cdLi7/xEw7ORJZme4yPv88JI9RnGxW7umdVIBAzwbucMY8CsCr+95pfpcb2WvT0qsQOEnE0eCyy0bTyL665tpMR2v+EOWnI4DtgOO4lWuFKcclrf6JIgQ8D77rbTLBnT78DlsOgD2VL4FoFL2YUyFHOZDxz8F3DaWm12GvZRoyf1wAwAqc29ojxkVwksPdzIAHCV6yxGqMMVlDa5lRhmh+70/HrnaBttmdNPBvFxCB9sOFPJB3c+c07gfOxZv7+g7YzIqaO7+Q2rCBxTnjIcdHUbcgCUZBsx/LoAIcNls0hCFRmy2K7YTsSAUEXEM/Cs3AVdJ8lihU8zFtVnVg3WRJneJTF3RfsDmUftgx1qX/ph5IM+Azav2H7IDLcouuczwn7luf6UIA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 267afe25-799b-4835-ed6f-08dd47758af9 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:12.7100 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jzwbHgp4o6kq/T1PqW3Wb+cbxHgFPHX1rWR5Rv28JxoSk93RFzVu1Q2XnbNCiiS01oRpwUdcKJyYeWbAynBVBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17170 From: Stefan Herbrechtsmeier A file URI can't contain a user. Do not treat the @ as reserved character for a file URI. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index de36f06bf..ab992b7ea 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -371,6 +371,9 @@ def decodeurl(url): elif type.lower() == 'file': host = "" path = location + if user: + path = user + '@' + path + user = "" else: host = location path = "/" From patchwork Fri Feb 7 12:46:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56846 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 53521C0219C for ; Fri, 7 Feb 2025 12:47:22 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.73]) by mx.groups.io with SMTP id smtpd.web10.68437.1738932437003972275 for ; Fri, 07 Feb 2025 04:47:19 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=mr2ewtUR; spf=pass (domain: weidmueller.com, ip: 52.101.70.73, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UH7gDkUnxNfLf87McdJqzbIANCZ1zwK7AfGjUf6jpg8fbPPPXdtbDhcyTMx3zMEhB9zgcptrolmnKVcvxxpHWCKfjxR1fFU0K41poHuYjnajjFQm/KYRqqi6i1bpdvnQMnpZWwK20Ss1IJaJYxQTavJMwSXdkQu4SxZhT57dOgGbFU0n0h19ibRINbK8VCqgzBf0xuDyAqP4AQ/+fB5v8YkqZrkiHWUNB/ati8nSP26WwlxzQrsVLrEnmWtGv5XwgZpg2s/7pf5z07PnfhYagoc6WpyFLknfx0Sy9cU0IZj9jq79kxa6pd9RW9ybBuKiFmBtyRhZOnCymQkOnIm14w== 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=YSkGb3Hnfuny3auLz2RXOg0fbaRMFrhScg0E0eTgalI=; b=UikaIS6mRwVQds8CfRxSftZHzosqwEV9vab1rKpJZVa+rd/9XF+QNsE9lCYxHGjN8bQ2giGPvXs9OBsL9Lr1hB7BrDh0A2LCj6XlGCvGa49mjTNjQRxkVQViOhwgaXq4xC0UQQC7zZ2agic5CK4y2mpZSJ5Z4k7vxFl2BA1rZIL0DONDpsG9TiYcTMpwypxSJ7HBiqtBPCxGIShZgB69c9cY4rC/oNTnMsFXrdd1JIkKBdYDu5EnxO3vz67XzXdm7fFxuWu6K/hFCLfrc2FjahbOFfRLWFdducR53SJ1FLph/enXXfAhojp1a/Diw/x6Y99dNyN/q94sGhbR8RdEmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YSkGb3Hnfuny3auLz2RXOg0fbaRMFrhScg0E0eTgalI=; b=mr2ewtURquAuac1Baie4MPze1QlDQm0TyS/ud7FP6lPo508El6qUSgnYZX6pB+lMOJU/+2ZdzPSM3CYLmopNxiSyFC7rZDSVfdY8lUkTXd5EDcTHV6+KB4XPs6DvsYmgEn3zFiFWAlriTd4JQQfgnz/beOpMJL7EVby8RsoNDJY6DbJRWH0qTAo7NselC8nwVmSr0aiIorHu1cprDSCciXkKGXOGS0zeR2Sdzuf+A9a6qijHMjE+lF67+HPse80Ounbf7k8auLV5yU+rUwP+mbM0kW2lLaH5dqhKx9akOhiKhL9IE5429g8wWrqsS2bOXvSt7iXMHnwZ9k1UFmoT8Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:14 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:14 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 02/13] tests: fetch: add test for file URI with @ Date: Fri, 7 Feb 2025 13:46:50 +0100 Message-ID: <20250207124701.14787-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: f36b9287-c584-409f-f20f-08dd47758b4a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: QVtLf+inqXYCw18mOqfkKPjLUp4WO7cVkJEO71sOE+IZrMHLFCt0ZttKYUGAHuasvFTXpy4Yj8m7b/ZUCILJ2BERy7vqve1//z6sdcgYrz8GtCljmqNEt9S4bXF+hYsOY21XCPBVTcy+dCBqVSLuv9+gKjwyQfsfVvl0rufq8PdquU18PHJn+BArcZjVR7l4dIAcx4VOKrxi434n3ws0l8pqk5bY1Sq1Y3/zvPG8vEd+WnSsCeJWXkaEwEpR5dbVDiw7S+uKmlrn12/LSMKDz7P9zO6DffwUIrHL+uZxl5aggpylQ8L/gpN2mVhPc/KLG03nVfgLf3pwLUXcBRXJbIGa39z1y0o0n9f00AIYLjKXFHQsMDrlYSJ8igUpz/LXZFNoSaj+e+JTMFK1zVBttb9YEAKqa/sMUVPFS4PFIn+hp7n3tILoQnfLLDBF8U5CETwJYxhRTeXoWbqSlQTmevNR/h5hIaAMdkPm9+CUAL1q5NUfPG4MJKdV9kGL6HIer3j5LoFXVnd3vyv3cvXZJPg3e94S6pu9msC8+DYs0ILyJiQ/BfkzPAi9Zjepw3JQypR3Ybd7abpg3MSZl/7RtV60A/UeZBpU9vyZM6BCyo2H78AumSEHrjNEa0vom4EUxG34twyczEelPhw6zNBTXGY/CGR1bH3xfREFEn6ukxgsRKj67akOTQra4G/hKf9KDaagzQRSRry7UdFu40NbuJI0PEVl3aWUgM2Kggw3xR9Ai135GRGC7VKcJDVt8inqglqvFUxUAJ9if8EUa+fETozoRm7zu++ZY2ecTdjWkM2CWU1THg9srBHP8h3K/avX11fzk3Y4usD0VavhOubPBK44c07+GiyrlqqXVZ+sr4gxoEbdzkJZdwecpJVX+dEV8GMt0NfXUNFBWo9h/m5uojE9meFOnEpcDFdTZuIILhX8uBlFqKYUqw+knk9LiQGhPGDyz2346/xCkDsyrXE2OjMMumbj1romcT+FIHbu+sK7urmnXjwJjwdbUCV9SoE3LT91U9VUVSeSYJEPzc6Sb1qEFSBe1T8Rur2wYsoDjjUbELKG4DnZpoReTmE6TksGFQYa10JXVj5rrnZ5ZLlgEWfA4a/UtGi4Ukk7TbROSzljJH9g6Uzjj1hpPerrApxERyTj6t4W5OBsIdjIWpqW53R3wj6Dv78J/CPsq/8s/+9JmTu3EwFvOXE61x4pAuqNO5yLsAitn6ng0QO6+miRbWJWvPp2pUUTvM12ceoOjn9EHkCGsXhO5WdtLIH1/Ny4I8rxiOl2Tyoa//yuiAqIpAZ4JEHYgBKsV9diru2YOLQSmk9r61mtKy7aLXD+1nBLKuO14ebydGasfP+M6MnQVAzMrHMa3alu8ekt4PXohWpiBYUC0XV5MtcQRwQLKwSTpedWYvhMuSZZPhXZnzZffg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zvTrFK6RqeRkm7T3kAGgNQrkxU9hK9N1qmLJnlGGDpixKoSIqU/yx7ZQtI1c++Uw5g/pAETRUQcQnj7fX6rZXdMa16jpecKp4EMwxo+IjMrYRRQNch8E3L5tKaSFklTu88CnpB67dfbF4egyjwoBeUbR/fAFVRjgthiGofPLdZtlKJG6hF7QlllJ4V/V7G/hizRANy85d+v16Sa/r1q4ZWCiJWV+HTVWXoCyaO2jxjpDkAtPbDvO8M+smLzaPe9mOecnnnsIlaKWuQ7Tw6kZ/836TpJSv+9dmdlQn73ZUWLAq2u2BvovbMaIpbAhahmz+akj+eQHLqEGJYd6DqUrv9G8VSxAOjhWz5IpVuvwsTnliMBkHkqCf5Fy/Xku+rxn0l5LgUsuyuD3IeqUHIXeHeBBqgjVOfIk0JpNpvZl6uPrtfHEI0EZ5LEdYoDy4nSoENEvnGkORzd90il42AQb/F6Wx8FTXYIjkVdqNVhzqcxu1cllFCX45TLvxnOBjo3yE1eWoXQI7tgP6D4PCowcfaFWXY3WzWIwHuHezMoIM4CX99hCwr777QTLSENCZc8SHI+g8FZFOwLdhQBrpwWK4cMvHN3QfFudCNEW42DHbx3EhJAXoip0ja5/aKfa0I4HAerSrZU1UIyoiScHJvy5lJXCFWdQ8JvkRSkLoTWkGW6EUcBQPEAAueQ9chrJ1SvqxvEV9a3Kr7LlP0u4x2orcLV4LFMRyF33KtfdNAU+fVt/w0K+Oq6dGNR8bKGW3Hq1KWOSAMfFRyd3l4kScVLevvWYkeBQ8AUlRAb/5ka0AJGEpUT6T54eCbb64CZO9WdhU5cSZE+UR8Pd7skOMUVflSambcLw8ZB+VvAYEY8K+ahu3g2etd3fG29GEJNQymUNtqnsEd9myKspWZ3JWjhIAtgp11lMJELq998iTaJ5CAtWXKqY/YyCrtgrUsMU4u3jNKfwgVdX9gValIC5gjmUVMIOTHuROfHyjBvSfX9gLp7KemVv14MHhAiICHoSshHiYl/vv5+/F13hbrcch1RqTjcwuX1Jq0QqOz+iUp5GBg7TzEQuzEi/PJnC9HO1cofl03vKPkagfLw1LKo6r++LFKl5zJrWbjIYpa8WM4totgxQmtskFgaQL2v8aCIfCMxC87y3pweGm9u4S6KTaYGaAYtf8d/ZwPU/SKMUdRkEn8DugN3xeILDTGW/F7IjMS465GF5JcqvOMX2ixeoefAzmkAtaaK9P0UWwmPonQbcpe6cXGfgTWI6W/BiTG58g+3v/6svYOwElnNjeMuIxaL+V6E4Gt+S7RGrl3rjxhIgJ6lC6CmoRW7CuV7/w5lWpdiU4B9LfxwqFW953nOdeYo7tv5Di1xYnAGD+ZP9fzRfYdo9ZJsZqRlp1V35iGIRi4IOApirFgih13bE2EYMn3xtd/Izkzk9SaHRit16wP3E9noEeKQc0qJEYLwskOomsXfFgO+K9OIiEdhL6wLmSm7bb0rSSJhhBhLu7MCz9ZYhmhQe8ES0X5p4oX9CIO0zDr2ubCnufdhouLNPBv5AajC/+UTAgQEJzhXIfjmk1t/WOLghFFXJmHVnRqv+Hs5LitrFa3UfDSH98OEmoE7p7VwL6w== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: f36b9287-c584-409f-f20f-08dd47758b4a X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:13.1903 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tf5P5ai3MVrb8HwMC43/8GbWRV3Idpq5dTCIi2TimR8DCptUqLNUK8v1zIVX2yeoiBgT7iBcJ0HTLJZ/dsRB6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17171 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index d64717011..3be7db358 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -323,6 +323,21 @@ class URITest(unittest.TestCase): 'params': {"downloadfilename" : "EGPL-T101.zip"}, 'query': {"9BE0BF6657": None}, 'relative': False + }, + "file://example@.service": { + 'uri': 'file:example%40.service', + 'scheme': 'file', + 'hostname': '', + 'port': None, + 'hostport': '', + 'path': 'example@.service', + 'userinfo': '', + 'userinfo': '', + 'username': '', + 'password': '', + 'params': {}, + 'query': {}, + 'relative': True } } @@ -728,6 +743,7 @@ class FetcherLocalTest(FetcherTest): os.makedirs(self.localsrcdir) touch(os.path.join(self.localsrcdir, 'a')) touch(os.path.join(self.localsrcdir, 'b')) + touch(os.path.join(self.localsrcdir, 'c@d')) os.makedirs(os.path.join(self.localsrcdir, 'dir')) touch(os.path.join(self.localsrcdir, 'dir', 'c')) touch(os.path.join(self.localsrcdir, 'dir', 'd')) @@ -759,6 +775,10 @@ class FetcherLocalTest(FetcherTest): tree = self.fetchUnpack(['file://a', 'file://dir/c']) self.assertEqual(tree, ['a', 'dir/c']) + def test_local_at(self): + tree = self.fetchUnpack(['file://c@d']) + self.assertEqual(tree, ['c@d']) + def test_local_backslash(self): tree = self.fetchUnpack([r'file://backslash\x2dsystemd-unit.device']) self.assertEqual(tree, [r'backslash\x2dsystemd-unit.device']) @@ -1388,6 +1408,7 @@ class URLHandle(unittest.TestCase): "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', collections.OrderedDict([('tag', 'V0-99-81'), ('module', 'familiar/dist/ipkg')])), "git://git.openembedded.org/bitbake;branch=@foo;protocol=https" : ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo', 'protocol' : 'https'}), "file://somelocation;someparam=1": ('file', '', 'somelocation', '', '', {'someparam': '1'}), + "file://example@.service": ('file', '', 'example@.service', '', '', {}), "https://somesite.com/somerepo.git;user=anyUser:idtoken=1234" : ('https', 'somesite.com', '/somerepo.git', '', '', {'user': 'anyUser:idtoken=1234'}), r'git://s.o-me_ONE:!#$%^&*()-_={}[]\|:?,.<>~`@git.openembedded.org/bitbake;branch=main;protocol=https': ('git', 'git.openembedded.org', '/bitbake', 's.o-me_ONE', r'!#$%^&*()-_={}[]\|:?,.<>~`', {'branch': 'main', 'protocol' : 'https'}), } @@ -1405,8 +1426,11 @@ class URLHandle(unittest.TestCase): self.assertEqual(result, v) def test_encodeurl(self): + import urllib.parse for k, v in self.datatable.items(): result = bb.fetch.encodeurl(v) + if result.startswith("file:"): + result = urllib.parse.unquote(result) self.assertEqual(result, k) class FetchLatestVersionTest(FetcherTest): From patchwork Fri Feb 7 12:46:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56844 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 4EBB3C0219E for ; Fri, 7 Feb 2025 12:47:22 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.73]) by mx.groups.io with SMTP id smtpd.web10.68437.1738932437003972275 for ; Fri, 07 Feb 2025 04:47:21 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=iHNnWVkR; spf=pass (domain: weidmueller.com, ip: 52.101.70.73, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jzZol2ViAXl7xuC6YITdha/nX48DHTI95MgEQlGXT1HbuwmEgLVBx92MClqq9XOyQL2I3cPS9vgDZrt8N6aVDn6RGDsEgRcIHNOWOKOSqmozdfpP8pL9aHIMeijeiD5ejH1+rWAZeFFAIFUjx1rMzrUfkH8KO8/XXvsdKD6eMR8g50Ju2mORNpO+cXQF8J31/nQKXayZa2BoyjEWNAHfCNsEBFN/VsxIKpQDVxwlbIy5O+YRrRJ2dBzXNW+7TlUUeeNFfs8+YcVwRnfglE1myvvtlwvMSQKby/IC7hukO98iq1H8I3wZBKCaufksYluQ4Ur4G7PI0a6jPEgM3rUruw== 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=AUlYW2S6BTy33jm3j0pR6nxwMZS08/WQy+wRjM3rl8c=; b=RSvEmBudAz9FChIKC0vKl2mdMRCV5FIdsyR2Z1xmJj0yvDNm7u4Jqx59boRWRHfdoHNWSBo689sjS+mFKXDGPbWMqe3wunO+tPQHXDWz/ODZc+3dXJZjipvvCWG4pOb50b22O/fTGLTQ2nX+d58lYWn6rv7cvS2Df9PnbRuKvMlzDVqalFrntj1Y7WlNYIQU4KuRaIu9zyixbR+CnKRkkQLTEVMw/27cI9MdE5NqfY1ect5XxYNkrv1j1OJMegA3I4b+ke0XPabiWK0Rt+PzgkgUtE4KdQ+wXQgyzsQGSE5BIT7N8nXq0s83nrsJUasqid6vZy4DRuQtsxYpHZaNAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AUlYW2S6BTy33jm3j0pR6nxwMZS08/WQy+wRjM3rl8c=; b=iHNnWVkRT57Uvh45i8r8SzNoGGtgdMzZvAVVwR3JTszR0X87sfk2j5F1PnwYVka68evYim9F3onGAgspsJoz/luf9su4/1uUJImO0XVE2UdkzM0339bj4adBsuzo+rjTfIFL8d57mGpBpvj4BY49y+On38u4L/AJmXqR3fe/TtamBgjXemdCAaq2FAEhpcPCbr0gBq5ggrIQYlJiPBXWo43BjP1z66K8rtUfIRPDPSn/tAXBNwKgDd0El0Yy40tfSn0CqgwWYa/S8WL0YWVxQFo+YPcseWnMkgs6IFEEHxO+d1GTM2gI1WBrx02Z9Kt2HZVN/gVazXPjWwoTvnhnvg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:15 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:15 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 03/13] tests: fetch: use lower case hostnames Date: Fri, 7 Feb 2025 13:46:51 +0100 Message-ID: <20250207124701.14787-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 934e44a5-3d29-4293-2a90-08dd47758b93 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 16ntyW7gTPRJN+hhQuJ0iUUI2qkiDlmbAql1L4LMDGdcKzJTFuvMK8IJAHxBAbF9Zr8WoyxojsDDHPjN6IYd/P1SME7i6IQfHIn5U/JHxd7VFBCD+fg1LbaRgtu+XEdjjBHDHP8TN5M5G8hdU0cTzhTKCh3YTc/sHPFGe97/Yq2iz7SDHEM/SC/xHgP0PdPf4zTtyVJhWra9g9UCyQ0Ei4YAK66HQECeTODFpaSz5NHPihYRFggC4eDWUVj+D2JrMInib2VPMEirzTYVBcX+1XxB+PdyrCcFV0ne/+5U30D4iUHW3YFw+n1c1IePwqgSQpIR7H3oVp3aq928CLmWQtlAHMfoDp+xZlK30ruGYq3yIOySJEroMJvZ0L/6X1IATGoxRESaCIVoixZ79m/xZpej9EjFE1kHm2hLdXaj2brSRte7SM9RElHQr7GC2hMOhaqNcdw3lLr3TsjEThtm3+V5l1FEWKcn6JtO4hrwkt9quqwqqNkuJPlDF/MYioL/6hco444S4YHYe5MKrfSdTJ9rhh+9GnDSfc1J0VerI/CEa2zUUVLY6b09n8L+ImkJmQ9gmI8mFDFW8Dw0gxLvJ1f7xF5nOIFdalpd8v9aGhHd0JZXTbZgGOCaD2IiU044tlhi71AeJM0jWhA9Ywgcpnp9riN7u+BVxYmpITbWJi+P2PWQykGOcZvFU/nGcCMpALN3qjroNMAFubomuv6/loiU5okO0R9p0QFRoDFVlF42qeQRctPrPYlJTC0RPnXGbn66DV4l56/cXGKqSvdX7cUVa/rg9ddY2PqCnRV6W3wmVHH7ahNLzD0uKzzikYPyEOnHlo6mqFm9sI0pr3Sd1B0Mpar48nmVZa1zhPEwMTaUETC7qKIQ+m/Mzen5SEzwJ3EpRZeSPuIRaHHTV96KOF8Hq9sjlkHhu6PXMeGJ3BZiz2At1ulZgONyhXIHoUEj73y4LF3RJy4l4xJMQ2q80tKJrZna6r2WILwJa16rXpSgNCWz8oWTGP9u4FE3cY3htrhyWAFtvz833QhlIwQnLb9dlOZ1JzcbcYfKj2RRQwdjhdbCSKtf1LP2Uy0OP65ors4RIerXzB+IDD7r0CmAAdzsCJdwVX/hczC6rjnsjJ0VwsAkwPwpGlGzCu4CVp44aEc5dqE2PnpIP8pcjqsKjyx1ovBrxeLvGpiYBIkMDARFWd7Zz/sx4EIGbHcv7IcK+p7IlmQtqCEdXq691SlLNwhGEmYczJ7dAss+fn2oXoa0hiYQ8SXzzUEL8koALrmWdn48F5vdy28+v6Cwn5orD+yyz5j8lqllWdrnqq0zvGzxPP+v9kBrDGP0fC07pBc0M6DxNTz3p1LUKrwWCmcBchDAJ44KTmi0RR/RiNiD3t5HHQRwIAbwgmh0Jaw/aUxW X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eC/EQoLH64syyGRwrOMH6H+LKOaVHgDyR3niOd0RClICPWqEYBXiLjpaRM4/CJaI5WRv0JGPdkc7uzhH4P4YlemV2R07NvAkj3cQjq2AOTjIgFDOE/yjVVhYfAYiRnuQx/K3Ql8qZ6j0wjh3Vl04HI9WxqSYRuSFjNVo4JqRTkNzGkH1/CGojI8MYOtnULSagx9SZZQrGO+XDXTg4KTwkfyjZhi3Tmuw6MEQwZbNAdLrf5AYXQH3XdXYKq85MSPJnASlUESr88szX8ELAUHdPtx/a4U6bwU0JP+IknKIOWr0Rr7Ro8nEkqY5g6wd4H9i2buG0J6LJBsm0H6vf0XQOWZRz+Quv1Ynl58rENhS8hIzbdSR8XS2sVJAmz//WK1Gt+IA62QWpt6ziPt+4iNRAQuZ+m25ooUGoZdbxaaOkdWIh0vFsxcSldESHEXmhBUoD0in/Qk6aLrXpbERKE6bRR2jFxC9pGNHWzK/mLHf4w3m7DVYKEihBiDsIh0Ca/zbuwkwdY4xKvAaO6KFHwP+pny3h/LBuj8hwHRGGOGiacUaRQaN1sgOi31vmp5bBkHuJbmZLAQwBLJMwBmFEay/VW3W1y6DOatOT23z7TGN8SZ8n4J+bO5Sw2Wi1O7T8HQj3gg4LNmIbLar8ELBeSp1MkzNoY7qz0l3olk4Kh1HhRR/Kcx84H5ArRLG5OJCKbw+8mwE6cREzVHZNk7O7ZumehKiVEukWZ3vmsYkNFy6CU5IxzNRH950nmJOiAcouc5HU6NABGKA6SYrSP5jXRyI8vIa2aFmHIRkMIa5xO2GDYNnGCTBneblZKh6IBTRV42AeP3qj20RYU6hqEt0VTYYvNdKu0BvHZOhudTTT6WAuIhZUOlGNa6iLEQ9Hvl3yegKNOfFklXl8n76o4VkT4qthnmztt8dO6E0Tr6TD8cYlgvm063UQnrKsTz9qDDIfL0unkJZZpj1wqRMnxk4rqHdGovHRJB0oV5jSfa25wfA3a/3S/8s7lf4v6p4AMVHzv4B3sfKzA2yNPtGGeM375zXQUV0r7c5oqWGmKmIuxpEkVvdmSYn/lU23+i5XR7GadT11Dynw4jwqERGMaADxEXxIXwCbHob5vn33OeAEWyd8zHRFau/yvZJPGrae5RpHFq0dMcHWT4XeJ8EBsYK3ahcD7cQhEkEUTvssRwQG0ZdQIV70guxDMsIivNrhjVI6cUBZYDZFIJ3MpF87R1xxj0o+UU5DXlQ0V5Q1k28u/46XSEpe9Zb+a+1Xz5L0S1KYr64xN4P1uFZOzYJqot72ea0rlmH4JMbDNFGyr300IuHULmCkQavU2/Q0WooweRkgBkDZLHtuGcX/ScBvy9/RtRTRW8ArKvfOcU1qZk1xntBm78xszP/SItp6H8lC/cHqi00lCoWRvRzgippCGFZAXdIR67+fJwlMnd4pMIDL7NDB7eU0sA07lbEQuMA7ifWnbV6NOec+faHai3Ni4u7q78cU7v09hjLyZtGZAiZGvD9VoP18UI++9RJfdG9meOHlgCfKJ7vIOd1mMhuh6AQZI9+hJP46VZVcpZoXfOJtLzPbAPYIlrYBn0jcAEmw4DrMWZc63wXjRKuUmsa0c2a359Klg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 934e44a5-3d29-4293-2a90-08dd47758b93 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:13.6228 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NKw5JLA+TBtJ+8a0P+y9KVrBvu4QYqRk74G40Gcjaznv827RDWHUOChR/WGJBCf0q8MELhSL8GCPQ7g34onzag== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17172 From: Stefan Herbrechtsmeier Do not use upper case hostnames because the hostname is case insensitive and maybe decoded into lower case to follow the common style. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 3be7db358..0f1cb7670 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -570,16 +570,16 @@ class MirrorUriTest(FetcherTest): 'http://otherdownloads.yoctoproject.org/downloads/bitbake-1.0.tar.gz', 'http://downloads2.yoctoproject.org/downloads/bitbake-1.0.tar.gz']) - recmirrorvar = "https://.*/[^/]* http://AAAA/A/A/A/ " \ - "https://.*/[^/]* https://BBBB/B/B/B/" + recmirrorvar = "https://.*/[^/]* http://aaaa/A/A/A/ " \ + "https://.*/[^/]* https://bbbb/B/B/B/" def test_recursive(self): fetcher = bb.fetch.FetchData("https://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", self.d) mirrors = bb.fetch2.mirror_from_string(self.recmirrorvar) uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) - self.assertEqual(uris, ['http://AAAA/A/A/A/bitbake/bitbake-1.0.tar.gz', - 'https://BBBB/B/B/B/bitbake/bitbake-1.0.tar.gz', - 'http://AAAA/A/A/A/B/B/bitbake/bitbake-1.0.tar.gz']) + self.assertEqual(uris, ['http://aaaa/A/A/A/bitbake/bitbake-1.0.tar.gz', + 'https://bbbb/B/B/B/bitbake/bitbake-1.0.tar.gz', + 'http://aaaa/A/A/A/B/B/bitbake/bitbake-1.0.tar.gz']) class GitDownloadDirectoryNamingTest(FetcherTest): From patchwork Fri Feb 7 12:46:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56847 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 62385C0219F for ; Fri, 7 Feb 2025 12:47:22 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.73]) by mx.groups.io with SMTP id smtpd.web10.68437.1738932437003972275 for ; Fri, 07 Feb 2025 04:47:21 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=tvACbtqh; spf=pass (domain: weidmueller.com, ip: 52.101.70.73, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DQovdd1SFBTeP4VE31DzoTuzY70n3pqZrXc5JB28BobsjHn1VSZ/6HuN7HswmcUw3IiRMoYoQbL/BdjY1iDOyfuznW981GeqQ0IbTOXn7SPDTqvo5jdMfmsiJlPsxnvRrxemPNhe/OkynHoIUsJlf6muE/CRsytbw4eGvDUsyghgB0wiMClPLZ6khZRfHNjfxgCe6txr+R3AUt5EvOP4FMze6DMV0WIRmncp00bP9O7eMzvvi7vICKEBjkpnUAcvIA9yh7fSGwLvlqzqNIPurTcZ2cxMK7rPZzJLFR2J7NriBLkixilk90Wn6Xf7lHCRjLxJJvxbfaZYWZah2vBU8g== 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=CzFUgWiIfso/6mjgIoeqQVWKrpMELQyXfuLKK0wODaY=; b=gaYKrRRKEXQIDjYXsIsJEPI/bESAx8z3jJEsxAm1U1WVMDpb+Uxo26iMp/J27nV4mJABM60poqbaMcVvxdrDEJFqrMP4OvbQIGjDXr8s0nHv86P4bqOcXyhWFxHqF3FvbBrGZKBwN/+32RFDvckOEjgXy5owY2Tsuhvl3q7xxuB5h6WujSOKPmSLJ6np9PBEpxqihHrzTb7W42hFposBrU1NN66YXvIm8KsNMItSvh05h9zxfcK9gEYSwbPvtdGNLF62sOiFvMRPfPkxaU0+kCpK4xYychJjzHzb/EeqFioUcmN7rA0UJxfB1HsEkGOsQNfY5Hbo54VYXZV9Jj/yNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CzFUgWiIfso/6mjgIoeqQVWKrpMELQyXfuLKK0wODaY=; b=tvACbtqh3+X2E70CshpyurVy1w5YIBAQvrWPyDO+lBTNag/rsM0ueFFBPYzB5jTzX2jxZP2cc7/6rHaPU1+yXjG0rMWvpc3OiLCIVW0hoFVfqbwEqsqZ7NrnyHfVFRa3YedxFxyfPnugVD7etJY84r0djm+exXXHMEpAFkVen/hmodMXr59QHWhVe2YPzznWSTjXA1x1tkCjzW5T91ZsBUlSacbhaWywFaSD4op1vl5lKnCIluSKI4rJ3VIXm+/rIsncV536785UPlNvS4Kegv/g0k1Z/F/tvjpqin4gv1YfOkeqUYzgp9jFkIZMWrklFKSmH0kEn2eJ4OWZFWN22g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:15 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:15 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 04/13] tests: fetch: quote URI password as per RFC3986 Date: Fri, 7 Feb 2025 13:46:52 +0100 Message-ID: <20250207124701.14787-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 44757d97-2beb-4982-9571-08dd47758bd5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: TbJ6G4IXEnEOiaI8PJjWGTwk436cW2+c7wPoRLDtn6DJTYUPIiuLnEp/yIiYHxJfXgVURt2iYIoYIu2NyTCxECiy0whEdQJpDybOrBLPMO/7o92v3heCCwBu30ZcqaN425Seh558efHY1G/3lkQXuBEsDotJCk9OtszuH2HtgNQkPcyIx6EpBR3Cjjc1oDORSXCPsmXcW8sYrazUWcsEJJHs6aeOcR4GUUfYBJxjrpi2hVMRhCuE4c3n9Uv5cNxXM9n861N+j9Ji+s+at2qECKN1YxR87o8cuuZ4pz1N84M86PqC5YZXEpKRFqtb4uEk9eJMg0Ywy6IdO0Tj1v2V4zgkHio73UoxXOGXf8VGCpuxZU1ZbeduKcHDTArEvtouRJ8WMNdQK7c9MeLr3oDMtfnYbIlzSsFeTUIeKQxeihVPN9+xlzy2EWgMHcUydRj/yp4pDVNbKgxok+x5D57fthtHHJJ5Tl6WW3f9ESyCbpyrFEZiOGhc/9VnI18AzqRmosvP9WUqQlz5oyaK60+gHJsipMd8NoqzC73K2/2AJOqdJ3to5RuYjS2nDDVjT2Ny1ZijVvi7cp1SX7qSLCsW18H06kFVoN/4QUlhdhQK9PEKskUyoCfWCU2Rpik6bMgUYOQdJH7bYDLqV7GlY2SNt4iKYfwer/OiEza9Yn3qZFv6luHcGBLQ5eZ4K57KC2t/t0XJ3mXlaI/qnFzKJf8jVk7XrOvHBSrm/R1B+SaP7f0UcXLLaZ9X/gugQfvbJOgEBDRem56Wq0d0bEVgl7IiG1dC8WMwNAeUceZr9xJJIohUU76K6cTuL3ajcWTjA8e4iVSZKUgsKqjInCo9O9ORf7hJ+Cmw5N2snWzHMBE8VwzOpkaNK78t+xzWpHslQoaiMg6MapuI6I8n8Tqs0+ABwPisNEiPlQoTiJbwiuYu1Sg2CsdfQUHmsJZRoAzN4IURHWnH759xLLm5FY5zgWHwAHMdHN+aPDzTFpYWprrbpAxXFsvbxajgsEXIYv1Q2renr0lG6OeADip86Uo64z2QWBy9sidAibIgPjtnEjdfTAPD2lRVIsGVx8IEpxhHXbkyrOMZ3BASDZAqfMOoX8nAzHRMms0eXnxIrb6CNTP1t8QjSKyYm4pRBqGVHyYBt+cz2ZjBahZEuP4jpRjNPHB3oZCYxqxGN48FBjhEH7D0KGApkvFUanrc5XLXd6X/VrV9uz5/Ps9yzb4uGgeK2uKzwVr6ZVg46g+6MANyPzZbdvRHHvdym0czzEvQ4+Nt7KlM76+YNm3xG+HKGyR3RcgbaeDox4AXUL1006ni0nDXzCApIq84yRRarytknjKbcBLpO1m+fa/EVeUCbhHQ7xhtuicQV/BC16Cu/ag6Je2vmttFin50rqkugDK5fYvFkPHK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AEICLa/B+lzhLCQUsL6LIzJGRpABeqKHh8WFl/vUF5EI127U1vWVsNJTrpTlhi5S0f6JSA5gbT/o3qBiIz/hdlBfDvs0YeR5ZgTW9Mx8aiWBLeiL4t8Ab51KBPbRXxIZLn5untvQomcgo6u6gS+/4cCiz9dxByldwLxNM9JLIvPHhsJyewU6gT1DU9KoUDV1WYpTxYopw94hgs8eUwAFK0iTHbf0byyC42Se0pkXhGewGEbxZGsoxpE4W1mT6IN7vwLYOEEsAB6YmNZUFvWEKeu+0Fe4t1MUUY0YeAw+0Z6Gz4Z0LscfGyFeXNtrhuD8lzspPzZtynbyCuXrzTBZhOIddLkKtnMzXGWq9DDTXj8rlGvIT57ukDbzV2EYureb9IbLjfEKdzViX2FTwtpAsC0zAyUw473IRzpi/bLPV0y+o1DTX+rvA75depCM4nEjeBOmb5FKSQ80veBv+gwQOEmlcpg/WucFhVQvS2TIeM3Kw8pTdTPiqP5m/2GOwtO2/RvUU1NQ4Y7JXwwecSRr2zpophudeHughA5uoYO/ATS5pj47JjdcU3UPVVx2n1z5m6z9LJ/XgXFwMzJIIYVUTQiv2IWJJiENYdjM7g87MXCxEZQEDhfYd8zsqp8cry1YM4Wv94klTS9p1Hcr498cKdFOVbXt6/wHgQEQNDX8MjRmDGjPHd+ULp00VqGdz2YKePhGanPDKjEfBhD7sWDTRw+ohLWDxy9h/Q5mPiyihTvibS4WzGwChe0Oyoxig3Wj5Ukc8OEbPMA6Pd9bId1DWLzckVLrJw989CX02EgwNKDJPkf77CIpbE7IQuUuQD03MCKgyHdDj+SsLMLYssqmDLGCyMVxUuFBqNnNWffU/QXnkR4YrCHn5I6T87VQ1ubuZrMPxJ1tsoky7HQZQVhtckE1DREytVjyAwgZgoLUdJ5gXKGF/ySO7nBgSSZLWKAdxIn7tJOhNHTKlgJvHf06713IXwBzrpXrFEZP2WTLH0YurxudxkBEw/QW6rV7rRFz8TiQzUdFoCxJWY6KmvPOxoNvvoDnCtgbrWRiJnH00gC8OHDVZ7R1z2qaZMSKtf8Vx632LpZ2dGmuZ07WSY0bsGGXGnuNDl7bkbbOTlMcumCiU80GcftGWErbD5cg+9RE3ws7dipB6u7J7KYl7Lxp+mlU4Zd8d3K7CpJs0wFoj8IOOoNGzUC4MvzlyLCIevUtUNeUc63ZCbNPcb3drU2QBh16CnrAEksWNmaB4VUOyBn7LtamxoyYWLiTlaNrEjX/IdeTgCbhyQH1SVAD2seOtAe9/F0Dq1F4L7YjPWIEnCZyrHcuVdSV5Zul1WFeG8VkV7nA1PaGl4lwbjzMa1QDqH+3ERTVVyJRBDaYexOYS/aQ3nV2j5PLDyoElNBvUa9hfTcb/+BbsbO18Ec8ZuKGpmarPk9xREywR0lSbMvA7oHDemqO0xu+p1tbb8sbUcW82ccl6GkIrtkJFPG8U3HJKFuLy2D84129dR1GxvGgRC6jjC/NxMcHrnvsUZU+ZUl/PR9/wqsBuWInl/YjnYOQU07wQDCnDaQZ9ect46E4/yXY3nVVPQ7aChQ57WZHit1KudjSuxtO1b5682TJkZpIZQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44757d97-2beb-4982-9571-08dd47758bd5 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:14.0868 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: y62GC1bsiHQZErbozJDrWvzYEDYk7tVqL1103xGaEfSuUSn7mPgrthvhVNzkAQXPl2bEH0RBXBB/qobu0NlLfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17173 From: Stefan Herbrechtsmeier The password must be quoted as per RFC3986 because it can contain reserved characters. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 0f1cb7670..48b9e4af1 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -1401,7 +1401,10 @@ class TrustedNetworksTest(FetcherTest): self.assertFalse(bb.fetch.trusted_network(self.d, url)) class URLHandle(unittest.TestCase): + import urllib.parse + # Quote password as per RFC3986 + password = urllib.parse.quote(r"!#$%^&*()-_={}[]\|:?,.<>~`", r"!$&'/()*+,;=") datatable = { "http://www.google.com/index.html" : ('http', 'www.google.com', '/index.html', '', '', {}), "cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}), @@ -1410,7 +1413,7 @@ class URLHandle(unittest.TestCase): "file://somelocation;someparam=1": ('file', '', 'somelocation', '', '', {'someparam': '1'}), "file://example@.service": ('file', '', 'example@.service', '', '', {}), "https://somesite.com/somerepo.git;user=anyUser:idtoken=1234" : ('https', 'somesite.com', '/somerepo.git', '', '', {'user': 'anyUser:idtoken=1234'}), - r'git://s.o-me_ONE:!#$%^&*()-_={}[]\|:?,.<>~`@git.openembedded.org/bitbake;branch=main;protocol=https': ('git', 'git.openembedded.org', '/bitbake', 's.o-me_ONE', r'!#$%^&*()-_={}[]\|:?,.<>~`', {'branch': 'main', 'protocol' : 'https'}), + 'git://s.o-me_ONE:%s@git.openembedded.org/bitbake;branch=main;protocol=https' % password: ('git', 'git.openembedded.org', '/bitbake', 's.o-me_ONE', password, {'branch': 'main', 'protocol' : 'https'}), } # we require a pathname to encodeurl but users can still pass such urls to # decodeurl and we need to handle them From patchwork Fri Feb 7 12:46:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56856 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 707D0C021A4 for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from PA4PR04CU001.outbound.protection.outlook.com (PA4PR04CU001.outbound.protection.outlook.com [40.107.162.101]) by mx.groups.io with SMTP id smtpd.web10.68438.1738932445099229225 for ; Fri, 07 Feb 2025 04:47:27 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=WPNp8ZHq; spf=pass (domain: weidmueller.com, ip: 40.107.162.101, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NgFbHPWJq8OrHnUI5AJz7Rf8MuTHM01iRZE6OFv0r6M9uPXYj9BTW0I06r9JDr7Iargp4l3pfDfqiWd3M94V2Js6dWEpP3ps8b4pNYe2m0tFJ6AXSKpu5egSvKT1J02VCTGdZocREEi26SL7VXRrhkZAEpcCkdXKNfMsPwjlQ/GqsmxITDdjYHXhSL9ph9waWosbI8yKEajY+leZX+XSJ/+UJdzRHeOfu8Mf5aOkMGqU9vwMKf2BbGXwE6/woQv1O3sOCdEuD6F+k93pK1ehjFFItNbr964RgidOTsv58av/QFAZcW1P/TJdm/VzrIww+GE0LwA/ZSmACBqRqATVWw== 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=4SntXOgJbCG0W5B5/OHIqLpdYoNcRVMPi38tFtmH6LI=; b=fPzhsUVHM0q2Uf6tQ02STp2UGxn1IIBaUTWeAEG04tGouiy5bURC6Nf34h450tc+Q4oQ2AfQE5kS7jZKM8rpZ3nJBu4+FWrJoJcNQQyqUoc9TJiZQBKx4QT1uZkJSOl/Dm0DR3+uTckCko0d4gjGdnrPNFyPQeVpmmHX4pzqzLgH9r4mo+hPZ7GLrktD6Wlt2Yw5+Af/Sub0+gYYLnhvHqlWElnGZDVQh38lFemTpgjHPI3+RxuTEQv6x+JTGHhbj1NbJWB+R9meGNlf0KEtV5s26i+sPPnC6r51icPxtSSK4Wz2lrJ9+3l75XANZ18lQlyUQLlWIZ44DMNDzgXLDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4SntXOgJbCG0W5B5/OHIqLpdYoNcRVMPi38tFtmH6LI=; b=WPNp8ZHqedrgni1IEmMJ1s+SIbFikBqPkTRY7cU5oZsfpm0FL+yD0P/TQN0mkn6nxw9VnGreQh19rgNExI490LVRAWfoVpTX//LdPHoyVqpSorfYxNbKiTtqM/wthEaSzXhh5CxjxeKcso1YZUOfsX9akV6rExk5PJwzmigsipFxL9GE1oy7VPxea57XCrZKNDBnODcZqV0ix2ZF5/k1F2SqXyiCD6jglIC2pjZksXHaY+eHUok6z+gTD3nY8cOpaIK4dZ2I4OuLVgnGFXGy+YzF5DI34jvkppYlusDPYO0KKFnvMHIYfaHAkgMXRyO14yIsc5ttFSZHSvy9MC5xvw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:16 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:16 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 05/13] fetch2: remove duplicated code in url decode and encode Date: Fri, 7 Feb 2025 13:46:53 +0100 Message-ID: <20250207124701.14787-5-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: c57d63db-f87b-4b63-f68e-08dd47758c1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: KAPUw4XcelKMWU5YEHIIkpAyWrGlI0/TpNeOXTWjcugP8vk/1d2ec/yC3IcbVJj3Pyf0JZxuj9zzljMZJVB+t+z4VbRVsuR6bwtruWN0TuMlteSsZ8+UX+C6WMqMddkKdkuVQBw2dRHVgS8v0Y/m094i+5P9qiwuhKzHl6rFyOXhKZCIIP4wIORO/W9tC1FenLlBpTS4EWreAsqDceTJiJn7kCeTXnmlKQd2YndoABBGrwrknmFnLRVPM1m8GQ78DpeRp4jvj02IHLW0NBAcZR2yA6/OvZo6GOMskW+TsMmh7JJ87YtxlGrh2HwNmwoScHMPgKyHIWUAu6uoqJHXnNIKkntgPGXvIin54P49nSsjmafL6p440DgRvyIMwOLud2WiYI80VCryKuBR0Hb+OL4JnpVh8iCcJCshKxqklT0dhYV2cFXOOXGIj9Qt1MXtXK7jN7/PFXHkAVFfvwA/lfnDbRSR/47dUOvoQfFT7FN6P7awH87dLnohJHmRWttvsNsgarrh4mgXNZfMnipV6sijsn1xXU2EfMcU3HgDcGWN7Z+ZBpv++1HVdU0icBbLA+uToHf2K3YyNVJui+bz8e+CdHBxar2L3/Oz6EUpTW2Qdq8iZgwgR6wQVbUILhJgOe7FGxIzz+nN7+RDz1CxJsaxFUOA+8mbDp44WjZyyw+ag2KRT0xdrbJmpXRMrMD86tkifHE9tFnAgQ3A8R9XDoiqv26xtL7Khy16sPWjoPBBoQmx/fTX+U+mz1Bb9DOPByoWtLHm0fhvKqTmEQjNd3V4AxbWQNiUq1ikx0vFQchDlgh+EMy5bccpOoRqt/c1orVeesCO2J0fZ3AM8zLZUadtdF5KEeofRBv7bsjjOSRJ05cpkuszog3n6UvxXnx5Psi7tDHmNLmRpAJeLBw4kIgedhdYvPvA4b09Axo8jKl4jNnfk/8Fru3wojkkrWKd8iZikawfa0aYoFuRqRS6EjVWmsbPVCsWhHcA5lRNp/zpU0sRyiIHDsos6/vhmY1IHdpLZ6GE3q+k+sryvdD8cWvnok57hZwyECQOD6FgeR0zTLAq8Q9yoRt5xtmD0ryO4GWmmDMB52TqVlDQf4OxsbTELG9LRt37eTFzasqZQ5VAzOkTkc6L7vMatmcZC6iTYOOUYT9CpPLSQRbBciGklEqm945zYpa7H2pbTLh3+O7ykxiFSN4zs7LFH5pczmAweM8CbaWtmWvhguK7h0fMBxw37JgkSL+KhTmGr3NF5ql0NrOXDppzi16AcrzeYlMCxPVhls/fqhhQJH2AiRgR0bjUDKLwmnG01JmwBoVI+Tw6ocgK6h4x7Ubj+Lkt0RXIr7YvFAnYmoZJk3qppEwxo80GilUi6SafBb6l5wBS1lBezzh5rnu3x7y7hTQRwMBy5VwYYfM1mfSZucDxiI40PBQVHXrMsebq+yvzbvqHic7QU8PrmI0WbNU+XHG05aUC X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: itPPwik2tLwOXgjzhmoJsKfI2uoUhFLLAV4r7qe3iTpxrOPGUpys4qIvSXamYE9VkIT2gmgc81H2+WtfYq3zd0ur470cPnE9y/CTDtdaASKdTg4gyXQUp8l5eDOjvGnxVR89WTSu80Et+OiqLlsEQFlsIXSF3Tgfcpi/JVluSc/49dBnWwnXVLA8OpSMtlipMZpFDBNQvCEVccCo/VnGRjynsL65w2ef9Yyqe9Xf3Ca7PL1Ti7vPpwkn5qwI4xSEU4y+SfXud4f9dGtgGUL1ZrHp+fo8sZ3qXFuAv20+qt/ZZHmtw9eBp35kcSd4Ag+9Wt0j0shiEBMGC+qB1bmxOO3+tn3yGYdzm+tdKdx4wmqyOHr67iPap2mugCHnaUNMblUCQBDp+xgJZui7hOlohLG/CF6CLUBwv8YYPDQRuOI3HKldBdps1VbGYR83JHou7dX6aRTFQvSRdLM6RksV+tDSxWxlYN/Ltz++rsRNIDS+QBvQPvkaEnXUDqYU1n1ZEGFFUFhg11QsAw5x3j4bpggpysFd8AH3v/XTKQtSAklBUHUdHxSo2174eDv4gU5V4KAB6aiysXkRwfCAED5L9HpuHrfS62hxqQowFnsvIEvYHZtIcYdoXPmPrglugHPUFrUxubsTmj4GXUQm6f+sKQkzyWwUcQoWu6Ffvj2tu2bybQFxOVgg4tNqhqs4AkMLJPvuB1Zlg1SAliq5LwmhpwqHfdpkLWq1Dgo3iURhERgVgi3Kloxr4BKcyeUFCt3FIk+0O0aK/vck2jWxexRBkcpih/3WRrV8+5C1skLLifpyxiCvyn2wm2Jb3tJ5P/3JmKC/c66WXpnSmv9xWPNuheEKtwPlk+khQo33jrBINfDlV86Wh8UymvGadyVUOKyGvWVslnnh0DiCM75s6uDRyfbQmxZIwIrolEa86zITveJfeY78qoE0gOMRBC/aSV7qQLJ+Mwy0rSHFjStW0tDWdAquXBJvpeDpHLY0FVZp7GzkmdeZfkefBA/hZ49kgk0gvVHA4QxvpB2Kim1nzYI9fV7ELO4jzA/yF4dcW9UC/YBVR7Obx89jrsZusti6xt48w343QfuGiqA9cI6pcqMRkVCxYPfOaI8LuYc+gjQRt+M1n5DmS7wQLi6x9pvVnWMHDztv4RAP1iZB1vhGTcqliCx73F3/BEwfoS6vIJPMCfv5EtNbYxElvVatmDZFF9oYZUpq9Rua8AKXA6DLmyDn1pNtpitbvnlooEKgnWrVQM+ghYDZNqg56mBNNN3pcyGHHakXs/fs7+4LLiMN1AUxRBbduWDDK6lQxB+VwBx8zLgvXqFZ3Fu8e5BycpIo5GDz3CG6F/3KCDbUwCC7gfXd9CQtBg19thDwWgTGMVyVSIFs71/hmuT1tGLA7NWxSW8oU5eQ2JMU2KOJWn8uhh4kNj0rIsP0WlxJQuszL0b/AYidFeed/Nio+R6nLNMw8W8oflDgXEo9gy13PPkFEtBJzfR4VmX6pNmCHcVZ1fMuo6mJEH6FnxJfv/B6OjwZHFpKevsCDzgzg6pBDLjgYXbMMs/pCUo8X5YZrY/T/XpVQgZEBvjsviyKJzgC2LmSJgkMpqdjEX2v85R+ex0ke/yPoA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: c57d63db-f87b-4b63-f68e-08dd47758c1b X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:14.5110 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yyolac7x4yp7kDaOpgO6m9NIDytRGX03qmAPlWbHYy1C7o9ZvkevjDh8QOaMd8LVn/Vu+2uTOqZgXhqAYQ3ixA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17182 From: Stefan Herbrechtsmeier Use the URI class to decode and encode an URL. Remove duplicate code and unify the behavior. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 66 +++++++++------------------------------ 1 file changed, 14 insertions(+), 52 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index ab992b7ea..2a60e94ed 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -353,49 +353,9 @@ def decodeurl(url): user, password, parameters). """ - m = re.compile('(?P[^:]*)://((?P[^/;]+)@)?(?P[^;]+)(;(?P.*))?').match(url) - if not m: - raise MalformedUrl(url) - - type = m.group('type') - location = m.group('location') - if not location: - raise MalformedUrl(url) - user = m.group('user') - parm = m.group('parm') - - locidx = location.find('/') - if locidx != -1 and type.lower() != 'file': - host = location[:locidx] - path = location[locidx:] - elif type.lower() == 'file': - host = "" - path = location - if user: - path = user + '@' + path - user = "" - else: - host = location - path = "/" - if user: - m = re.compile('(?P[^:]+)(:?(?P.*))').match(user) - if m: - user = m.group('user') - pswd = m.group('pswd') - else: - user = '' - pswd = '' - - p = collections.OrderedDict() - if parm: - for s in parm.split(';'): - if s: - if not '=' in s: - raise MalformedUrl(url, "The URL: '%s' is invalid: parameter %s does not specify a value (missing '=')" % (url, s)) - s1, s2 = s.split('=', 1) - p[s1] = s2 - - return type, host, urllib.parse.unquote(path), user, pswd, p + uri = URI(url) + path = uri.path if uri.path else "/" + return uri.scheme, uri.hostport, path, uri.username, uri.password, uri.params def encodeurl(decoded): """Encodes a URL from tokens (scheme, network location, path, @@ -406,24 +366,26 @@ def encodeurl(decoded): if not type: raise MissingParameterError('type', "encoded from the data %s" % str(decoded)) - url = ['%s://' % type] + uri = URI() + uri.scheme = type if user and type != "file": - url.append("%s" % user) + uri.username = user if pswd: - url.append(":%s" % pswd) - url.append("@") + uri.password = pswd if host and type != "file": - url.append("%s" % host) + uri.hostname = host if path: # Standardise path to ensure comparisons work while '//' in path: path = path.replace("//", "/") - url.append("%s" % urllib.parse.quote(path)) + uri.path = path + if type == "file": + # Use old not IETF compliant style + uri.relative = False if p: - for parm in p: - url.append(";%s=%s" % (parm, p[parm])) + uri.params = p - return "".join(url) + return str(uri) def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): if not ud.url or not uri_find or not uri_replace: From patchwork Fri Feb 7 12:46:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56849 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 49FC0C0219C for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.65.129]) by mx.groups.io with SMTP id smtpd.web11.68552.1738932444338795086 for ; Fri, 07 Feb 2025 04:47:24 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=XqrehPX5; spf=pass (domain: weidmueller.com, ip: 52.101.65.129, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Xh7NPkP3R2iipmEUlRxrgUCyCJ589os3X7sLbYmxG26qyX/NH6UDdSKVIWHCzkLtyKbUKrDStZwIjcGBHccUTTeQJgxzuco/Du+IylaQb4Pacx1EW825wfEX9OGC8fNJgbGkgfCQYHRghaVAwJjmhU3rNxpyhIvUJGtkBWdSEoIgPArGsRzfOd4Ou3CeF4/xLhwAqzZu78H3lNDSy8XblARBwI5QQ4BO720o+2fClh9yBR9MXr74/aBb0YV/9bCovwzLYuPu5hh7IJvk2OMFF7DA8LBpFgyH19OOG4OFjbt8WzPAQfZXns/X4tuzbCKBWhqn5xkcpcbDVbhX3XV7ow== 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=Z8MStnRz9o0D7a2oN0qOK6/H9nEajUDEsJRS473t5TQ=; b=t5mXuQ7J2QXJ6iUE3i7LN614UvgOCuOeIQ+3/UvQiiOU1OiQJSYwVBfszXxw78hW3cOW5/1hhMaiQ6Z8+IrafDRKVQxd5HTFe1Gsye54//tIInKaJ1l+nGavp1RA20a4xpH6plh2+L/Gm55ea25C7q3uYO440+Qugf1Dj68aE9ziIN5h8w/knTEwSeYhVLZ80ktWRrAB1idch0ICjlOAtdmJ32Yyyg3zlRAJc20GuPAUPCdd7ZYFYDxnYnj2r2K3LpO6YlecDwvYLtYS7PFLRW9ICgYoVuTa9TGS5SHLkhrHwkvAAfuwHX3if1feG7+XkOv3INxQVMIXl+UvjMGcxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z8MStnRz9o0D7a2oN0qOK6/H9nEajUDEsJRS473t5TQ=; b=XqrehPX5d5/zLwZFx+eZCzR1/vxKuhBBmOUWHPkkTWdv307TeRVpqdw1TPlxlEnDuQcQ78DZz3srg6z71LcICW9QUBqwVZxN/TvTAOA/brnLJ6juExnuqkBWvhKaAagcRKlbEHn5d9TIF+p00Lcp6F67hGbUB0MbQ+GMVbq2K+SlJ7v3ogZu4ivKcP7Q+9dHK8AQ6A4nf1YLqVQBishGOeRsCuNo4UycL9wPmf7sxpqrNkDanNBJ26td6hugnE0kowmsfOSxY/EGw3jljZCa0gIO9rfqYQspUJiGM4mzahwRFwKp6NDeZaUeKvfu/ZjSEVNCOkl5jqcjl0Q1ERF3HQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:16 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:16 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 06/13] fetch2: remove unnecessary expand function calls Date: Fri, 7 Feb 2025 13:46:54 +0100 Message-ID: <20250207124701.14787-6-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a941e25-87fb-484a-ef95-08dd47758c5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: N0Xrmo8dbj8QUDGABiqPaZoY3tSiuqaNigB6sfsl0sYQBFh19DtNBqtaYF3s3w2Sv9SHAQfvM5Q533/v3vNqVlxC5Fg/xVsAx7ECSmFlKyi2fHmP3nVwFa+PLUUvvgwDGo6B9IA/J5tVgCcTd9mRawOa8AfBT+/09JLHP6SUMzeb+tSh8VP+H9jZa31UJjAftTBKijpiHS5/n3UAbSu8y2iOSYFVwzVduEH/Xt6C81M760EjbxVTamrVKgNQipZBrkg6lUdXQSmxPXhF5eqIKoOqem0H81qGWCmxWWJBjd8EW/3rf+KBr97utTf8EC40vOgd9Zb/8hRe+kNei+rpfxxmvXcecVwEF/ezyIBMzWnjvPxMzkWgj/J1/gOTzS35VvYXkwT2mzMOG3jRIJbKYnc4FZZGMWHRwsO5nozlz5xKWPnI4wtC0o6gDAmi4us33NuW56Ho1U8FDN5am70oNBnAD8RMIynhA+WNYyedMoOBa6T4MpnIwzwDCZmSQFma8LHUpZZ+loohEIy06xpQT6fcjCDeMuKC+iw4PPjAvFz6rgUEz/kQIcoBwU0BQQ/8XhXKlgvUeyJq+4xK9bqM1nuzAAsZlwE3ebPKgL9kQeqadUkdOeRSrEXjqJfbuxhJDbVyW+dQP3HjrPqdPdGcHYXYTkHfxLRo0vVbOcMogR5WbMolLTSPtDeiPnnOr6kLmAT5bs2vPO/InM7gVUOJ+Je7z5uSi65oEwbrBL1bLXtBmWePMwEtPZrMJscLMWdxJCJ2qmQBzKMiIO2JCt0wcWB73a+Nrfd/vF68Kss9JIsK8khAJwBqO8WL5CEZQ1g1yw8AMQ/4WZpKdBvbcrZKsfrSTO6BkqyxYcCkjS+8xzFv0emyKZWNORzdC8G1La3RUceoo1x4Ou6u/pXxVRQACbHqkgu+9dWGaLus/4hkDEpSeP0JoGnJwQqRnUvTsTFriUM9kj2ZouttLQRN1MEVwfBM06vjzw8uCaABUjwaCwi8kXQEzoPDthHFHljPreHnkQmI61uQ+/gWkd5mYyePNwYi5c4Bz+4LxpvSe+L3AbLaqAMX5iBk/iDGkLN1hQPG2K+c8Bn/7kPtoZcl2wf7q/WfIDEiF8NQv95XrY4C4XsMrTGPuw4NXI5Ewd+/bKo6UZWPLdbzAJZ9Bb2O9tswm0NOa/COQRR+ink4n5J0IfeuxtML7eLVez83NGf2YbUI7TKXSjVLUr5Qrc3XVzYNyYpC8lePQzJB9qJq+sPvAqHRctVch0aZkiBJGJnu217H0OoxhbImJWhKR63bn8qvBJLYK3qpQAmtgaa2c+oCqN6HfzDxLqM/5z8hXU3TVFgJfemUJ0cVaaXt3Fi22cIc4Qmx86jfyAixHgt4c/YFoauWq5IuokZ/MF0JQC0iEPdW5FKzxs8GbieLVyQJkh1rZ/IMgfzmJvG9+TC8OMUVHvSpImYegwGvWHWz/aG8+sq1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q9B0xCPT0eiKsiVVu7VIN0WPX+1KTvD4vxH6Tpt9BR9VHc4zLvbotkX+CEkc3N3UyQ8Rbddd7JqNxjl4Cpa0FnaH8BB9m6+Srp8+PlkG6/wkxoGhWmW43LBf/GPqVeUofQlIXN/H6jC3t47VWS1xLi4nUNeZKEe/1bTq9u4tkv8neWGrcVEzo8pMdnwKYt4tmyjEBDN2ptdhG1cU2F327neeuTT9H/YaltYTz8SVTgEqDBOvMCWC6Uu8bhDPGoRLrI+Ye07G44M0FURfqCoDOL0ICEenuzhdIqY71PHdyl2ZN0qqcft94+2CpVlOmCNYUGpIydmT7gRxNVKC0Gy7DQsY2GzlIzS2ilBBZfcTg22i+EWh2Y4qkxzyGq3PaX2kkNz5qCexw4D097GGeM7H+etjxf5b+oyKUzef4+5IXhJsDQIcp3bJVmSxokVltiLMCAC+DQdo4G0EC3laE1KqUxJp03dKt++YZ0R0I696euPe2dGn3u4KqoKDUHOzEtDFumYLIRGOFbp+/+YCoWFlThyfTwKD6GU2vklWWvTio+hENpBuT8F6Z/jwjA4xFdh3qmVzNXblUZmYzkaxqZv0zke8JQogRLtuGQ1RNO+IOjghGrFXbLKaEdW5CEVsFCQaCYE/3TmPoQxVfvuDt77Q8Ixwt+Qawl0WvoOXR7UYT9Y8tVFvXWy1WxyrTh+aispP/pPrPn58H7+Pal1NE/iVJMWQzfj5vj/QGT1RxMRe+KK3kF56vRkw85GLktUzhc1vkVWE+mdM+JITOB0cp0vL76yrk+TSbKskvOrlI5LY3KxS53wvBypQl9FpJdP/T/WRDaXsguPs1uap8tsM5dZq/JplWDBTD3VjHfuA5xvzjvY1SpmuIaIXbX8u9tlAKlJJ4OyEZhJfWjwLwiNzxQxj5qu9rqqoqSjNc0YqTEk6vO9//ZysKSjnYnK1by1MU3NQ9OjOQyMZtiGkLcSsYT+Tjis9dAEQZz3zaAkW9zrRWs4VovhLlKXfDOGu20SYGpSbtH4mbiHTGVzWn6kl41++VmPtnGTFiCJAjyTr4Bgw9xD0nWVIFtvdgqINbQqA2DoWDmetSXb3kvVtlu4Rjm4UujufulNb0tHmwB2bX5syYY/HsMKLoBtCuMllzly6Ek4bMeyNuEWBIqJayQkpK3JXxzExBw9xE/4qpLw/P9O/Z91/Eo8J1kAU+3QMXDQo1Z94JDMsIqgu1Tnb6FC/2ufrMt3MYCSABXexUIg368DdmmTmyljR/YBgVdogUtD3lM2adZAp9VY1NgjwEB8K2RLXhqKBtQu2ySV74Fc8O101gHJ4LWBGYkjmnetnpk1qrjPMBVHb9ejxLDmL3TgjeAS4ZH0/+GL5itMDZz+ahIs/y1CbTFyFTQm5EHmAqlULeWRIw+3VYm3zBBclYoqYdABdIHjmAA4X986hF7AkxTJ5hss7xW0BNHnTpMfCYhCzLkGDK00ZbVLU8DGTk5YKjtxzuja8FJpRaV2Dvnf5LaPZjYIyPZ63KvMrjyCX/ImegkE9B6W9felWAMlalzHchAoxVsQfI1HVKg/LzkTLKm4/xx/ujzS2tRBuhpKYV0zjCfh4HF+PnAO2abJ3crFknRHSCA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a941e25-87fb-484a-ef95-08dd47758c5b X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:14.9279 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oDZI7aYvdcoRKv1hXYiei9ppW6bPPhVp5Z873ghxtqGzojcwjpUg3EtpBIQKkf3zid/Ys4+o7eXsiktvDnaz+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17174 From: Stefan Herbrechtsmeier The fetch data class already expands the type, host, path, user, pswd and parm variables. The fetcher classes already expand the localfile variable. The getVar function expands the returned string per default. Remove unnecessary expand function calls to simplify the code. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 4 ++-- lib/bb/fetch2/az.py | 5 +++-- lib/bb/fetch2/gcp.py | 2 +- lib/bb/fetch2/npm.py | 2 +- lib/bb/fetch2/s3.py | 2 +- lib/bb/fetch2/sftp.py | 2 +- lib/bb/fetch2/wget.py | 4 ++-- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 2a60e94ed..628cae023 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1147,7 +1147,7 @@ def trusted_network(d, url): if bb.utils.to_boolean(d.getVar("BB_NO_NETWORK")): return True - pkgname = d.expand(d.getVar('PN', False)) + pkgname = d.getVar('PN') trusted_hosts = None if pkgname: trusted_hosts = d.getVarFlag('BB_ALLOWED_NETWORKS', pkgname, False) @@ -1782,7 +1782,7 @@ class Fetch(object): self.ud[url] = FetchData(url, self.d) self.ud[url].setup_localpath(self.d) - return self.d.expand(self.ud[url].localpath) + return self.ud[url].localpath def localpaths(self): """ diff --git a/lib/bb/fetch2/az.py b/lib/bb/fetch2/az.py index 3ccc594c2..346124a8b 100644 --- a/lib/bb/fetch2/az.py +++ b/lib/bb/fetch2/az.py @@ -66,11 +66,12 @@ class Az(Wget): else: azuri = '%s%s%s' % ('https://', ud.host, ud.path) + dldir = d.getVar("DL_DIR") if os.path.exists(ud.localpath): # file exists, but we didnt complete it.. trying again. - fetchcmd += d.expand(" -c -P ${DL_DIR} '%s'" % azuri) + fetchcmd += " -c -P %s '%s'" % (dldir, azuri) else: - fetchcmd += d.expand(" -P ${DL_DIR} '%s'" % azuri) + fetchcmd += " -P %s '%s'" % (dldir, azuri) try: self._runwget(ud, d, fetchcmd, False) diff --git a/lib/bb/fetch2/gcp.py b/lib/bb/fetch2/gcp.py index 2ee9ed219..268267b7a 100644 --- a/lib/bb/fetch2/gcp.py +++ b/lib/bb/fetch2/gcp.py @@ -46,7 +46,7 @@ class GCP(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = d.expand(urllib.parse.unquote(ud.basename)) + ud.localfile = urllib.parse.unquote(ud.basename) def get_gcp_client(self): from google.cloud import storage diff --git a/lib/bb/fetch2/npm.py b/lib/bb/fetch2/npm.py index ac76d64cd..c09f05044 100644 --- a/lib/bb/fetch2/npm.py +++ b/lib/bb/fetch2/npm.py @@ -166,7 +166,7 @@ class Npm(FetchMethod): # Using the 'downloadfilename' parameter as local filename # or the npm package name. if "downloadfilename" in ud.parm: - ud.localfile = npm_localfile(d.expand(ud.parm["downloadfilename"])) + ud.localfile = npm_localfile(ud.parm["downloadfilename"]) else: ud.localfile = npm_localfile(ud.package, ud.version) diff --git a/lib/bb/fetch2/s3.py b/lib/bb/fetch2/s3.py index 6b8ffd535..fa5292dfd 100644 --- a/lib/bb/fetch2/s3.py +++ b/lib/bb/fetch2/s3.py @@ -77,7 +77,7 @@ class S3(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = d.expand(urllib.parse.unquote(ud.basename)) + ud.localfile = urllib.parse.unquote(ud.basename) ud.basecmd = d.getVar("FETCHCMD_s3") or "/usr/bin/env aws s3" diff --git a/lib/bb/fetch2/sftp.py b/lib/bb/fetch2/sftp.py index 7884cce94..45b6afb4a 100644 --- a/lib/bb/fetch2/sftp.py +++ b/lib/bb/fetch2/sftp.py @@ -77,7 +77,7 @@ class SFTP(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = d.expand(urllib.parse.unquote(ud.basename)) + ud.localfile = urllib.parse.unquote(ud.basename) def download(self, ud, d): """Fetch urls""" diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index 198426065..7066d5e2c 100644 --- a/lib/bb/fetch2/wget.py +++ b/lib/bb/fetch2/wget.py @@ -78,9 +78,9 @@ class Wget(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = d.expand(urllib.parse.unquote(ud.basename)) + ud.localfile = urllib.parse.unquote(ud.basename) if not ud.localfile: - ud.localfile = d.expand(urllib.parse.unquote(ud.host + ud.path).replace("/", ".")) + ud.localfile = urllib.parse.unquote(ud.host + ud.path).replace("/", ".") self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 100" From patchwork Fri Feb 7 12:46:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56855 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 7071FC021A2 for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from PA4PR04CU001.outbound.protection.outlook.com (PA4PR04CU001.outbound.protection.outlook.com [40.107.162.101]) by mx.groups.io with SMTP id smtpd.web10.68438.1738932445099229225 for ; Fri, 07 Feb 2025 04:47:25 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=2Aevs04w; spf=pass (domain: weidmueller.com, ip: 40.107.162.101, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UgqukmDS5oeBnMDDpIqKlNT4FzmiTIj6Cv44BY2KHb8i1+c0Bhv8WmMpzIrWdHK1GZaa9D5ysJn+9mgnotIEE13Ivp0m04YDIMuv+GZufsKkJWpKvy8KJPywjzkknbxN0zGO3dKTNiRW5Q+b6cRxMIeN1QbgPOjNWWHfdjFLDIYhhIgt6iF6aDnx/HFZSBd33NhGA/i9pfZUE8FmXwFazHvOVQ67WVVID3jP0agTq6aDtgVdah+i1/5+LkFsV6KR2xEZKKeZD+AiUlVy0ueHjdpjrGdxoUY9kC3ubkuoBZt+f+rPLoSgD5eAD4CwCY0JXUo8Yt/Zo40AE0qee76Owg== 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=ez4FpGCxQ2KAvrXZjcXdx+AwiyuugMQwa+zeyWgelDI=; b=keq7K3+iR08vW4wmxQWCnP6k51eLbaJxSVKWZOGAYMqn5pNdCdyD6tbRaGbmfeMLTGu8ByzGBI/CqKBoHFjgkRQRq3QlRjRrQX7+Ow1QUHhmtk5KIkrqPn8i4tZKoFlxgMC3f4vOLlOmJJf7Muzv2Ks7BATUrvaBQfVZbREgx8zo1pHQYb9f6JcVo8Jq5U/v1GtzNjo0M7bqcMb+6ue7RIofmn37mQqfuHl5CG4U0BkQ+avOMwowL6G2L6zAfEwEM9PzVp6UWmG7JUzxPgTM3GxaiBnLLASZlx4Ke5d3WOgHhbge1B/pUOlkW1eqGQm+4PMIGvAM7x+FPrG44ZdZsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ez4FpGCxQ2KAvrXZjcXdx+AwiyuugMQwa+zeyWgelDI=; b=2Aevs04wJ9XdgKaQEERwL90csVyXm+uGImih0PJOx+0Po2/P+Ti3/Fru9qYvAhpQNsE8wXartPEDN88iaH1l5UC/3ZvK04RaeR0Xbris/1uhyQcWEJZPq6SibIhBaCQ/E5sWDglrPDExlY+BkJhFAdoF9s9mv/JV+6FweujvWuNhmTuIACh+5rCtxI6NLjV8ksNF2NtTvMMMLq8caFgEeBf/Rn/l/vhzch8ZMhI5xdfg550t0yHxHL53/7OqDplqQhF7HU47D9l0euE1a3x6N3qPWG1hUzlycaxx0kDSW8OA5NqWXhb6OK7w9iATWFhxQbu0zVkyuZNck53cQhO6TQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:17 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:16 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 07/13] fetch2: local: use path variable Date: Fri, 7 Feb 2025 13:46:55 +0100 Message-ID: <20250207124701.14787-7-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: c96b9a69-6648-4c61-1b0c-08dd47758c9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: /a8QEFeezs1syY7FIQMCcLEVHL5Hx3B7VGuDq0LXkQWhiLT/fnVOoOqiXFtYO7cs1wQwPoPyKb8uSqa6JNaO8RfkuJm0sB1EWFQC3kuNYD+Ydm5p/29YtHyO/hys5Fdn3Ic60/I9pp7CphEpS9RozgEgcqwbNnfY3CHocgblqNTDyeQ3XvDKvZDhCyvTCe+wp15wkQEKXoZVbsuBBt8KzV9wfFerEE0vWEFrUpGNLrPdnPoVBgYq8A4lWeUReqlBg5UIVoZxl5W/VIMnLp+yay1MoYNteYMeApOC9L2z4wOKpndSWRBtoPj5GE5BzTFqqeqKEhoFJzQAnHzWxEfzIVbepMuKfayYWtBfF+tRs1cDT8YQ5lThg/RWK18MjCKQlnp/PyelmKmp9N1hoom0RpAdxfs+h67Rm7+Kuw4iqGIuTrj/l42BcaA+gkwwd/jYZKPGtjWrlqvkTIwqs5vZiU0JRq/3iPDFAxrY5uEqFhZk9m7GQJ91TfJV2twUSbw6S8ML+araMbDguDwLwpGPbRs1snxFNmjWswl1soeki5tYzx7v/R9nkw/2lrcuLQLI7d06wnyekipuV3jTpgGyRaaNEdhwGrWZacDUggyfaPnRswkJlzpu6MCy077YIdSoVfyvc4vSYwIu8RrBRrcB3tzKnjYHbODZxjX2SzUBtFdQEcXhf76WGjXeNDZX7vXovIahxENKvdOp2y9hh3AYyqKUdVeoApDvdEx+CLrCCtcPkY4T7ARzfGDLDIr9KGHDPOeK5ZXf9xiQnYPbwGolH1oqS02FDzVVOzuOkrDCpSVybOOepcTgnvf1hDGjMOZorSDn5MEBw49ezXbNi0bpNSfrXku5DMI/TNn0WdRsG2v0muq9Mybn8LVTm/YJZLXZWUDwJXbr+//FqBN+bzGhZGBycbr9kH8LdbclgEj+E592WjLLLGRxXWyTSzTEpXnRVNgUX/iCkcWnDw8dXP3logIZMa/WgjaPYtk4vGHz9GCJGdQDSqjcaM7mD8p3lZC5TpKO7jbdY5I6tYweeJgI9Vdh09szni550rRuNFGMOSeR38jYFHKXg9+a2cUA1+jXk3a3MmOr6owScQtPJNEWQcZzYGHFYQrvC4yNPSfGBJ7Z2QtVKzO0UieoHhpISNy/zIScVd+Ourv25rfa9Kv2MIYlWZYSJ0i89p3JF+EJ1MG6Eq5m8fYpf9Vcjow7tf6QpoNCc8lk8eQJtkAqdm3Lq+J6d2u1lwkk4HXPVhYGA60Sv0iNYuNt9/EX6D34mHHvAnIL2MyBClSWHH/HH85sJDZdcY6iEhoqirs3mUSTijB0qbsqQ1am/8sUBwi+ly4eMT9OVLi7XXcUuLkOB0vGyL6Eybst8Lw0deimSnvyZfbpSeXEfQCfleB0Qy4Ti5/dms5luXpTxAQ4qc2CC5XBsqEQblknrT4BEMiCqPuOY6G0w+KWuLLzS3PwaDZM4g0n X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6xBSmOHdQNNEggnYl5nBEHvI9YxE5JGz23tkgDvqeWLQVUR8HWDPVBPE40WZKl8KkTQrJ0481VyNu50rhcKpeMAs+7hbsERnWQwa8QLT0zLFwx/e1FzrfYWwatdsYNATkP0RyOX8LTrGFQiB4JZV+a37kvFEKmVdBHyzdjm0yp6PZhe75i27135fcQeQV5J+kRFV2LMrfMEcuECz4QFa8WkcJbacCC8xHLMYWV67cYBTxGB4hjKpT5UiJjHU3kEM/j2yuBUBtcnxq5d7rmIgkR/nsLC9CgujJTsGWeiD7TqZANTbCBcHxlR5iBPyg05gJVWHvInHH4c3Xz5424uEVQrnCspYNmBL5d28dRrjSXb8rcMfrpGsrqSR1MWafzcwt2f1UyjPtbhrYUYKEFtYFgOi6QQWpJ1mXoyv1cZKKmnosVfIbuEJwSbTiH7OaGd9ySfXr00Ib1epvKQ+1P1y98jNEnQt+ereCRbqIJpVh6T6GFsJN20mfVd7u+QrrADFwRxmXq5K50n+MDiMcDgVtBHchpVkkvtdzLBRaph1lSGeTc7kYIInzrabkVt02u44XucAqVhCnMvHiDog3OwlsaBg6o/Kw3wb/HFFESJo6/GhhAmTHI0k7AKxXbsRh+YkkY+Owg2vqOmq2chZu7UNkjRO/kTKgWrilEx/8THjqy/X9Rd9ST1Jaf2HdgHiLLS3QD5mCMEB0x3B51msF5xMjMogAit3OeVefcKPZX3n0vx+1UakIOVAApLB2ayS+O/zxn+pJRVU36s2a2sWpT26RquDhXmPZQfmai0oMe1AsAwoO5pXJjch4k4Ja3v2P0AtfWMZA8IXQ6E0ZUxbE7Nya5UbX5WbiaUxVvcBmneCI0TwXRENtjeH8d2+CM4JId2LFSC1amfS56NURC9h3mCzNLxznB0LzI5CpMDFKDk70U9ijSTY7giyqES7apOBoQoJYpKaLwOL6ICSQg7F7XQeAagraUd5xxgcbU7NWMYKd9S3q1L0zS+e8hkdS1mY1N5FkP3PNw0Zh9zjV4Ym2nfs2/FobZo6hJcP0jGWPFy1TNpx5XqHV7eZ7V39mQizfTPO3mh32oXicvAhuH2qg6VAbxKo1imE/LhBNQ/tdrbEO3LLN2d9tXC6A8yAlHBIXn1EZabhWyOPTUb81pPsZpKCx+TKgp25y3+HJ0lXInX3BRmcYkL3qDgI/liNUPSd3xiqMJbB1WfB15h2a1SVwYG1FFwxz8gufBzi/fLHWqRSkroAsqqfIy9iEdr5397ogIp4nmDbnRTfA8WpiaJeadI3bxyjXTPywd1Iz8129Tdy7LftR5BckOYBIBSOIpQSqr1o0nvSySUgGcTqGj9pSe/o3F/S8w7lUKuNvu5KxRzWEl631+NjKHi0l+dI5YGpmiC829tpF5VOC4CU5TX9Dj1+9Q7e2YSizliAHe0PWcE7bdjDJGgOfyQTwTP4kIg4Ub//oYL8WW5xaHm5bk+SPAoya+djPvACfBKRWIOV5YFflyCRPPjD3scCpcNbMTKZa7TYXB7vbeu23fa+hlI8E5UNAzLAYCdg02bc4fo7sXkodHeYFhX7whgQTrMiapJzwu8bn8ONojefQwRKkQuERUQ4uA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: c96b9a69-6648-4c61-1b0c-08dd47758c9a X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:15.5615 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rUVcryDm99f3G0hnmyrlS7bJdLD0/YTeNhdkDZl8Pbqa1GLVxn+bjFMko4u0+jWihbSFDz4xAF0Q+GYXBX9aBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17176 From: Stefan Herbrechtsmeier Use the path variable from the fetch data instead of decoding the path manually from the plain unexpanded url. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 2 +- lib/bb/fetch2/local.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 628cae023..bd87f18be 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1236,7 +1236,7 @@ def get_checksum_file_list(d): found = False paths = ud.method.localfile_searchpaths(ud, d) for f in paths: - pth = ud.decodedurl + pth = ud.path if os.path.exists(f): found = True filelist.append(f + ":" + str(os.path.exists(f))) diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py index 7d7668110..fda56a564 100644 --- a/lib/bb/fetch2/local.py +++ b/lib/bb/fetch2/local.py @@ -29,11 +29,10 @@ class Local(FetchMethod): def urldata_init(self, ud, d): # We don't set localfile as for this fetcher the file is already local! - ud.decodedurl = urllib.parse.unquote(ud.url.split("://")[1].split(";")[0]) - ud.basename = os.path.basename(ud.decodedurl) - ud.basepath = ud.decodedurl + ud.basename = os.path.basename(ud.path) + ud.basepath = ud.path ud.needdonestamp = False - if "*" in ud.decodedurl: + if "*" in ud.path: raise bb.fetch2.ParameterError("file:// urls using globbing are no longer supported. Please place the files in a directory and reference that instead.", ud.url) return @@ -48,7 +47,7 @@ class Local(FetchMethod): Return the local filename of a given url assuming a successful fetch. """ searched = [] - path = urldata.decodedurl + path = urldata.path newpath = path if path[0] == "/": logger.debug2("Using absolute %s" % (path)) From patchwork Fri Feb 7 12:46:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56852 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 5A42FC021A0 for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.65.129]) by mx.groups.io with SMTP id smtpd.web11.68552.1738932444338795086 for ; Fri, 07 Feb 2025 04:47:25 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=mO0VAk0G; spf=pass (domain: weidmueller.com, ip: 52.101.65.129, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=y2zygd4JUtDADUwZOQi6ojKVIPCVT1YIfUHuSi9ry79CQsO+w7PaAhbUJ5XYRLw/VlfpdbehKrX9bu4iT1T4j8A3i6SKEZ7r5jbpkQRnntbMOe6yyZrhuEcEufW6RS/Ox6tjGWd2U8f1Xs57RDXOAXUQIWMMV5uZFfA4JV3oR//iCF8qGtTVuDXjKNIjkuIDLnV1HMzUTm4mYNcGVE+NiVv1TfkdmzcZR7x5WtxiHZK93H1zNXnikqgdjs3LmD24oiqUFsmQmf73My055WX/Re5PLJVeHvniezd5dDNLLxR0GOeo+wfsTXC29b0pY8pUGQ7Bei983IGbv0lysr/B+g== 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=L8etdPKbcLYyoAHOtdrw23JDPxnOh5bDZZRVDpfXUYk=; b=EeS7fO22NUG5t3OpjfKN2Z4SixCquLtIkSBiHybBFA+ciZA0lu5LHqYXCw7ABDmj8woZKttx2nzTqImig9OcAscAWJCPN9bNKNkkgcMPdKWzAQrMksN5qlwlIdsUo3tjJ3PpZ3oNXpGiCf45IavSikm1bvaz+kK/VSX2tJ40wBxVxfKFmdsOKjIASK8sP2uL4GDAeDR4bHqVEHclV91qB914AkQwjHommZ6LZKgL41eFyBxbz5+scSoT2Z619dWu4P6YJ3gWprfpaV3uLI2TOH99UDXJPpXsIxPZ0h84DCDAaJfEyNm7SEUc9yhliNPG78C/ix9ryEzTUfAPo9lI7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L8etdPKbcLYyoAHOtdrw23JDPxnOh5bDZZRVDpfXUYk=; b=mO0VAk0GOh8Gcn8A5uEW/b/2EO80cLoz2+kc/y+rCopkK2r+Q6Jh5hz7Q0A9/JDuEXTKLTrMutujjwYz+jrhqQF20KT/jPfAG7gla3nWYnhASA7DsNJtIBR6ZPobwMN1h61bjaWs7roC8yAkxGFOIYRww9fxOnuOXnMRkHVZr5jvabkcQURqHYLNhqujHssE/6mdD5KS1inOjazcaYURgUuTR6H37DiCOTePY56RMAtxaNNTNHPvQtdNBZvpOJ/jOiLwvCTgNcbi2R0TomTOVNqKxtTBYjqTsS91RapdG3qI+nFBHzlStArLSAA4bPokzdSh51uBeGl0S4gnPeihJg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:17 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:17 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 08/13] fetch2: remove unnecessary unquote Date: Fri, 7 Feb 2025 13:46:56 +0100 Message-ID: <20250207124701.14787-8-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: edb99380-b64a-4a47-a72e-08dd47758d2e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 6E3auwunbvY/DotoCz0M27QGaNd3qp642spHzGL5tvCl6Rq6cBr1NVsNlRMlGWOl5MQrOEw8d351y5ZtWyHfifqqMdFYCR7S/l2XVQNKprRl1kIyG7ZGe7ZiGSqSr0R7DRNxzEUBBWaYH4HHQhWN/FCyUU4781P9wH+gbUEqra636vnXz2NNO0uqEHpoKRv4NzsFndvcZh8Buq+RGhr8Suqgh+1yecFlcQeRx3UjkOqMJUWaxF8+NCQzI/Y2GqI5aTkNRJNZxURKW9GhH8Oz3p5bj5mYjRp2uiolQWSw+MDKVeqIh5jXDkxxcuO55gPrlnnrN6DojcuQhjiW1+HcbU4gL+TzqfrdXvS32nltloIcUwrfbkTeH1WRoobJv+Tuwk3WOWlkGQovuPlqctT+urTL2RDWseYH0+7Eb/QAG3BIrIVeQxz0OSLyD/DzlVVCh+DvVr8iTN9lg8yED03Jd/1iPf8nGgFBiqozPoYWFTWDL236CRmPVuKGDEVEk0zEXHW6zKrqSsD9VTuwyQrCXwkaanSaB6FiTXCSbUy9yldZ5fGaHj4B5TGPhT988G0BuSpJ9FcMNbir4ccnzcQynOzujtBWue9zjwot0N4c/irbCjrBVuYxDVp5j8Nhcn054dAjqny7NczrWO2kg9Q254tWB2d7PNZHTx2O+vSgmDr7Ozz31DndNwQl6mld0//NWduwEjfoSCl0fxiz3N0HUAPoho6tlm+EkAlFLaOF7D2nXHdzzUpSdWu1pt0RB3Y57UMli1QYKhEBF34YfGSggf/w7TGCtCpA/d2Wvc++hENuxtEMsEzYxV6iUiOSQsDtRFHNiNFRY+wsuQQfDtEjb5UvN9PVJ+hoYfxEzS6uQ66sU9vTU60ZrL+ASgR1sK3hXDT1zh3AAwY+Gd/OnkdleFPhUDx/Dgyo9yLofz3Mh2+Uav7tMvMuBIg3OTd6hSiV3Ziz3zmGQ/qszgvRs82XX3E7xM8NwxBhxs3q6tE8rkfvCE3lZad4sdLGcuzfBvJXA30ywq9DPLQhAU4ZPY1X1N65JSLAF4cN7JnrP/ufoobCh5pkUi27AXpDhuVF4AwOZQkUloF2iB8pXar674jFDRr+aJ6oMZ8k2DdGbtEtHbWZF7+NIuhCst612HVeR52/46EuonfG8Yoa5H6XEM4noToHd45zmzU3dgQyvxYOULdWB/vf5hNITLcV6wjMx6HyoOZaaY2iSCsD/BOA0d1DthqZknd04IynioUsg3xUqvb0IRzpP5Gotsh3zULHRd6rnkVax3wgJBBuLA60SeVgo1jge/sbycd6vXmPZ0EAN4BUl+4/EbNeyWPmv80vOSlD8gYbjxfX5Ez9g4a+sUaqxIR9A86sTcBnlurOwYSWr/TZ4/54eWNT4btrha+3uQ9IsO2RLhidR9EXVQlMx7A8CHwxr2Lqxqe3XyZyQbptnOcYcqqk57Z3eX1O4nQh71Km X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:da;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LJlhS9mT2GhAx/s0LzQlu2EWgsYCZHUJUkrpPufGZEWxf0VY3m+CPpoJopLcpMniYbvVO0M3Rz1wC82IXS76JIaoeipzeTNV9ekQaZR8AQ4JKZ/LQKghGgmL5v+l2Em7RsjlqIJ41M1C9ZFMVQnwk/Sgicktw9iutZK38DoDDTCcX0BbVhjTwpAlg2RcslmcjeLrbrb6uBxBKzEt9Uryj9GY3a8BDf3Kf066EgzzUR8X3QkopFkqNG8jib7sQyMWdphMnfIyTxRDoPzc1OIIA6AmDfsgGE6+MbXGgLgLHf6EmqI3Q04994nwDBb1DDAZYq1ICTEhkGV+/veq8W4z5wdl5ydlLyULFJqiQ9mVnh4ezEXwqPZEUQAHBb0/ZSdZr5mmfn8BmYCHLF3KHJ/bEyivPRqAoyqCBIsi1QuXstD0vHEAzIGzAHcAOmUaELu3PFzN9n6zj2sl6xrYp8zcy+rm6HGw7ARTqxu7d/t2GfQFTsryPrVUV8HkJ/rrRTf0D77OiewW69QxxGbmzPMWeRdKcvJWCZxryFN+ZVZzmOtBkc7WEs/MkOwJ5nUF4kOgVQClTKd1Oaujx25+8EhP61Ks+Hl0UJGHyv8jdH1RQV7CSdZmH/af5K8TocoVFLMRvEL850a9kmWdVCyXb+XOOODPmpaIMdASQL8QXLn8U+9pe3nHbYxgVdZxEoERR2fctaKhJ8rVyONwHJdb8SaBzfYffShUzpPFEgVfleQ1jgk+6Y/IdVjqSw1sfOqxu/K31ZBbcYtLqCkoccosMba+Ec3Sn2au7KoN7yq04MU7BZyKEbdC90VNRFoVRcFp8Apa7KZCQK0xxaCngAeF6MCoznE1qLUvLe5cXKzZIbjlk/l0cmwqbFF7SzuWNzSpf5hVrS0Zeoq4190XEdSjEmZarPEN/2I2yjzkV6K6OgA0KKC6rawQ1H5PipHQA5BP4R27ueuJCTgWG2BNWMEkuUFTAYN3FLC6Ji6uFCKYA1Qr/aLua7D8/eaRjnJeYGZuK8rYYP5t+6OD6H4u4ik+YK5XddOrLnmP8eNaTSCqicB3LlCWhjGk8DYAO4wGyZyFrCfoPWTop7ukCiZicIenKbfRB69UO/eNIkf9fqT3Ima94/R+Oq396pz6fKQml17z4148Xd+9/5OxJ8HDZ131HIfzcs1dqebvQYfmqkgS4sN1UY9f/btcbZFte4X5lbKPwD1wwiic+G6HqFBkaU1kNrB7WXQOO/M/9/ounKHNJpP8L1MDFhMsUhtobrZHiFP4G9Y0NfWxvGS9FQCT7if0aC1kqhp9ZPqSNGeQuvam/faqbHBF8UAek2wGrk3Mn5WmFKnr5SkuXy7bKNefr6pL1GybXVTAF5DT9cHTsGEaigVv13X3cIJVBi81ld1+Ea/Lesnsp6Smu3OBdETxShZPqYxsjV80TXw53IGcTaOZZbTrPfG7NuHh4ClZhSMIQG/7uL7qhBbxLbwNn/84beFUOn2R0yz7OQIBHmS8Zx0HiTqjXlhY64u1QfbMuKFZL59oaOQtpblxM5M3fZMA6K+OmodDoVpWZ+RDf+6TAOm/D7bjn+Q8E4ieLIs82mR7CBDnp86X0PNJKvPK4bJKSW03DOYhbg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: edb99380-b64a-4a47-a72e-08dd47758d2e X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:16.3113 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gyhqtJWVJxZhNK/YGAiSAA2Hy5xYGDvR+FzaulLdNA/SnCrCBSEpH576kyFVcaImeTuO5NcYoWMx/g4uLxDoKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17175 From: Stefan Herbrechtsmeier The URI path is already unquoted. Remove the unnecessary unquote function calls for URI path values. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/gcp.py | 2 +- lib/bb/fetch2/s3.py | 2 +- lib/bb/fetch2/sftp.py | 2 +- lib/bb/fetch2/wget.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bb/fetch2/gcp.py b/lib/bb/fetch2/gcp.py index 268267b7a..86546d40b 100644 --- a/lib/bb/fetch2/gcp.py +++ b/lib/bb/fetch2/gcp.py @@ -46,7 +46,7 @@ class GCP(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = urllib.parse.unquote(ud.basename) + ud.localfile = ud.basename def get_gcp_client(self): from google.cloud import storage diff --git a/lib/bb/fetch2/s3.py b/lib/bb/fetch2/s3.py index fa5292dfd..22c053813 100644 --- a/lib/bb/fetch2/s3.py +++ b/lib/bb/fetch2/s3.py @@ -77,7 +77,7 @@ class S3(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = urllib.parse.unquote(ud.basename) + ud.localfile = ud.basename ud.basecmd = d.getVar("FETCHCMD_s3") or "/usr/bin/env aws s3" diff --git a/lib/bb/fetch2/sftp.py b/lib/bb/fetch2/sftp.py index 45b6afb4a..bee71a0d0 100644 --- a/lib/bb/fetch2/sftp.py +++ b/lib/bb/fetch2/sftp.py @@ -77,7 +77,7 @@ class SFTP(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = urllib.parse.unquote(ud.basename) + ud.localfile = ud.basename def download(self, ud, d): """Fetch urls""" diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index 7066d5e2c..6cb728ab4 100644 --- a/lib/bb/fetch2/wget.py +++ b/lib/bb/fetch2/wget.py @@ -78,9 +78,9 @@ class Wget(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = urllib.parse.unquote(ud.basename) + ud.localfile = ud.basename if not ud.localfile: - ud.localfile = urllib.parse.unquote(ud.host + ud.path).replace("/", ".") + ud.localfile = ud.host + ud.path.replace("/", ".") self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 100" From patchwork Fri Feb 7 12:46:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56854 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 6E813C021A1 for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.65.129]) by mx.groups.io with SMTP id smtpd.web11.68552.1738932444338795086 for ; Fri, 07 Feb 2025 04:47:25 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=1sxN//oA; spf=pass (domain: weidmueller.com, ip: 52.101.65.129, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uiYTfEUa5wAnzVC6LquLjVV8qKMRU0yY1BtAPuemBBdEUkBnwrvdtW0PF+VEfWC0eoADTrTEbXbRbKk0liBJZbg658KcwBw0xv9KgsomqeLIEC4GZhACWjeT1Tyz5/djHQQ7eywZ0UUoYRxywjgDNl6xwQCvcOBnmfLg9zJ/gzfEi5Skg9jNCRYQCEZKKhPsrrs67oB8P9CWBLswBYeuGLv3yt3RsPHR7Ewh2Cs+2XsMRldohyeHbk6xmKZWrNNQzUri/nwKZqkFm8RwVIrysczMDMsU5vgHHcoC/20Cqr4F7DouCuuFFoar9C8n13vfKZ/Gn4Cx44BXF29Bum9ntQ== 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=mFrsIDCTznAVEwj2pHqE7g4ibZPXvKg12zDmzt3unP0=; b=Vnd02Ry9zQRJgtiZ6LojbyhwcSEgmtQTf1DUeN0LfcRj/AcPyYSNwtLJ92DncX8r5lP9ZtAvbQuo9yur5JaBswT8oaLs/8yLkVksyxMtUEhZWSQw26yaMI8L5oS/a0NTB3VKQ1lTWvMlRDXOHNVYO/e11hLdkberZkQvLHRI8JcpYg5hwKvolx863gYvTw1pxzX0imDJuLY7Db8ImFkcTcJFtFvqb4wjk8tYUtEzKRwiyFKXRzL4aMaFzicrEEIHvwpzjlnUffIEGs2ErZ1HO/lwn/iWj6iGorN+yrGrJDGPCHGEABdjbRcUHUX3TqjGOQu/oUWpNripMkcD4JPTQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mFrsIDCTznAVEwj2pHqE7g4ibZPXvKg12zDmzt3unP0=; b=1sxN//oAnhff8z8x4swFWfxCF2E4sytrYEXfoy2T8sQYTFhPm30SZRVDSdaF01GzpfYrI76YLbbFJz1hoiSSgQiv67l2llaH2GiJ4dbmkT0V1PWEmg0IQFsJbwfw7gRFiY6mcMCD2pS0MLNLo816DpzJKnrGMn21h+sipHsVd1mp601qM12xQxfvDi7ZWkFj+dveTUU+PRKdRRojTJWkiSvrLWlwqtAoFB50GjiK6DXk9coCNQ0LkzdOSiyR+ExAVzFOvjtWogHLP4iapOUnAt+r9rtoG+EZ94mIgYC9dcfIh96T8lbUk81cx+bbNH7Jx2EUURgaFoqzq3JdzV39gA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:17 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:17 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 09/13] fetch2: ssh: use common localpath handling Date: Fri, 7 Feb 2025 13:46:57 +0100 Message-ID: <20250207124701.14787-9-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 93d8bb24-f5f4-43c8-21d0-08dd47758d71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: BvTxo02BmoYARnEhSHSGxNDZ2Pxy1W12KMjJCgMFWIIUnLaslpsb2J0MyJxwpZIk03GUEIvG7j54QPIN+A57gjHcB5ck6Jym4Rt5FVUPalgV8jF8qpLPbkFlyjjs6xh7skjOpcWAPPwGBVzSYv6OAbTNR87x7Lan3hIybcMp0C+b5O31HSEZgqcW+Ap89Rdgtl4EwCro5vmJXneh9u2PnfvquxzP10DKXuQydE/Pi+JECoMVnJt6Z/0cL6g5YJJ1g4nP310WXKIt7MENKOfRgCqzO1R8LTYhE1Bhvcbh8bfMqMXvuEpaUG4dZ+5zpixFU1CYXXfP3OiB7LspayRTMRPl36YS1WItMtrN3O9yxVhB0dp7Qexk0up6N1Ed453rxclBR4z0ZsDLVbfOnvh31qJAStc73VOFa+WR7MlOxEtjXy8q8b439tkNpKKS9TQRej8JM9qdsxQxkeKaIYwy52MtNufT/mSB5cvDd/6HV9wRA06nV72aOMtvGOeEkf4N+6r3UJb67GvabeIAR/MObeTSDUhkijqAr5+7z3dJ5Zez/fv7x4SUlDyfEWqk/HbcqOsoXLaHw8CQXSn9dmXb0IuETBxFMy5bmNPxQHfaRwHrdunGv7OY/7KrvqqoDntK5I6+1tqWbeOhJgGi6YAh7slH24iyNqEOOf46/y7YgjyDDRFN1sxnHCoPp7LgssBizLAUwmzjnveZ/960F4PMPyZ6dYwRiWgphjjBI0ZxDAvmaX/YN3hUrfsAVfo/np7C8uKMhRiuoqJOPywD6FiJuOobJdXGsrrOK0E4iw1NcF6liU6aceH6QSppvpDKpQen+X1zJIeY9XzpsrkxM8ZGfCchifCZ8OnZOc4Q+oPj1TSbKxIYB1i4UEfulYxqYH/CU5H2V5TXfSz0P1Q3Ny8u+wGNxs/QfsWtLCWlVIVGm3KTydYxJx5mAqJEoHcv+8iyPVyyDf67aEKo3lUFTaBBLYscMmhfk9Hf/Lm6lCOrK/8WtoWQefa9F0uL39kGcnH6UjpabuBo872uFVCavpwKIk9vjh9L7j8sGZDep71Hhd+Z9n07yukPNizA/MzIx9Uo8Bir8MBOf5cXt0dnfN/pe/7WvQzk/5MrKnMOYz7n0djLh7VlCpq5uYVljudrVAvjk8LTwSwuEti1VU4vuTqzlHUU7DilPioEeZ7FXzqpXRD8IyjkhUbZNaMpxk3xGiwA9SEOt4NWbfVpAPpJRooG3c8YUfcb2yKW83YcpctDITPDd9Kk1woa6kfnUevfdRah3gEk0TpjPjIGiLDMeF37LmIVy5NVu671ZCT6yONbEukD27Oxu48aKc+a4lxrQdqaxN07n4t/stMPmfymNNnP6/7oXA2Ou/DurUUXqZpdVlA2r6nBI8zfkG5SxMqySQRlbDGWGj3rMbiicrE5m+4vJPYNvByJEjEw2xsEtLGwWP0Cep5EZHfNBlpDPfEK7wQz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E2u0LjOzyWf18kJkcuFkkzvKrYLYzZ6Z2E8Lp0Zryqfj0ImzwlbB80eUMcv1c9E85TLOvS+gCv4UKWkoKNGjjeSEFcAaP+GCRZQG9mPXCb4WDMNz4Hu0AEqxmhbLtStEANNTDvQv/ETlda/FmM/NPuegO+uMSGPUxuXIS4k/axnc4cKSyz1g4jLNPaRnYPmuQ4yP17HtiuVYsU0jbmXkWVrBvmzC0t60K0XHkXNSzOJUQyLLSQKh3wrFP9U48ntvrzwE1DO4gokr3jFXIY2T+RAagNC6Tla9WKuHCknrTDBqy39gxrkKNYRm4SQOjiYDwDBlFJBu0hUrsC3f4DZ89UUpLEL5y11qnjdh2ZEqgu/cDgyTDXGj1ufYSamL8T9khJCgfrtALfMTjtWKRNfelvMKmqs6Ls7bFueX9bRQKqEptQZzxxTfGX6HSWaTJkNpxmuHSqrxCjPexN7H4GPixTxdHWwLasWU6mJWqJpdSLBU0R7nXk76YcOtcmRmZh01opjZZ+UtaQF3W8TYOzmba7pAt7KFOXpVp41NrACEGSQgi9B93VmHD5uCyPtKJ9KYSia4QlUQ6rikG78H54JCY9jarfYfo4QH/hyiWQLy47G/2j+o9a4dBlWOVOMjhN1drnY7MaufsNNxc26YTdjDvCvQyN7sAViakEdj8fRFIeQqB99vk8r/tRvnIWofgqHSbQWj4SgTOccfLl5OupVVdScB8pCxu2c8XrXhpUXU1G0wkBkYHm8zU4gc9c300a+j4bKYmRzQJIoNZWgXFc8+ED2PKVRV2sT9wGrrr8ZIWrHH/1kuMBYKUkM9IfK8/cj4N636sg63YXc9ZnA2c6mqnj9r63L6A+N13nS1g/rQvyle+sPoDx4azDnrgOjQMsRfJXmrLKWg8dINvZpKvVMrHhkViW6ABdXEwUqvVCivfOoNBdR4tHi89FidgHtQeBo/4zfYKu3tJH4nzhKeOyc/zaTVkWFfTVm4JzJu34CLkwt1gPxxiQ+cjobIm/ci61JnFPUsMttGmXMBUr5mG7U5WaIe0M68Y4o/w8DiTk5+A9XIz7WylrYCTSbesAIcS9xx+TviwJVOb9oD7Yxm8OARlXEStUw5hSAm66WDF1UoZmU+1q4L5IrbBMGbKq0U3MRMVgLGdm4nAYtJ+aeTlMFOa6qO69B5YdJS/i+05yAR9vZP9QTbk1MzY4lu4f8dXsOpNYRmPhljnNQZE3c5OIIu8vc6RwtKqBujAur9XcUaSEHDA2pkCa5TZaJCbSRUUrGWiWmjF7DCVANEtV0qQ20lffarG2hJ1OASY5y+xv8ON2tVL+BCvsGJPZdUFKgoHBZC71uaTT00IIctYI0qSsBBlpBzFlalJj3r2LfBBjm0edSFQ3iNZXMfUM/bgTe4aS/iNjQDTTy7+TG07wzDDm9Iy6aL68cckrl+fHT/76quFgOV5LWbaHBqN3TyAZgwoz3cnI+jKRWuaxfCuqNcdQ9qFpPBDXiqXvThmev7Gy9MySVsRWzQ85JzpFcut07w9sThFx+XmsHYm/B4JNOZPMkAXX7M/3zORZ4uodGc1xxQXyCChguuloMhD0KzB8tB+UNpWpw1muXBpq6qUe1iX8jB8w== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93d8bb24-f5f4-43c8-21d0-08dd47758d71 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:16.8398 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VdLEtluksHLV/DzyS6hv9HFWTpPaXLPDdbk58JHxE48HMNkjz3Llo1TmiYWA+Z7lssqSkgM9cg1siKNOiagoIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17177 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/ssh.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bb/fetch2/ssh.py b/lib/bb/fetch2/ssh.py index 0cbb2a6f2..2a0f2cb44 100644 --- a/lib/bb/fetch2/ssh.py +++ b/lib/bb/fetch2/ssh.py @@ -73,8 +73,7 @@ class SSH(FetchMethod): path = m.group('path') path = urllib.parse.unquote(path) host = m.group('host') - urldata.localpath = os.path.join(d.getVar('DL_DIR'), - os.path.basename(os.path.normpath(path))) + urldata.localfile = os.path.basename(os.path.normpath(path)) def download(self, urldata, d): dldir = d.getVar('DL_DIR') From patchwork Fri Feb 7 12:46:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56851 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 4B60BC0219D for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from PA4PR04CU001.outbound.protection.outlook.com (PA4PR04CU001.outbound.protection.outlook.com [40.107.162.101]) by mx.groups.io with SMTP id smtpd.web10.68438.1738932445099229225 for ; Fri, 07 Feb 2025 04:47:26 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=W4YYi+Kd; spf=pass (domain: weidmueller.com, ip: 40.107.162.101, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ni7UwycAFOnm/AitBIajKY/a1ZtQHdFZWN4VG3ondoBmJqOvOOeA8hy8xhJzD3Gn2kueLn7191PfrLveJQd6RYWj5fXZ8rVrH8iHS12uGDWcigDY4yL7WQVqjBjVrK62+cg6zU9zCZI9QkMcAK/YNefL+/UaaCJTXov/Y8Zs71h2xw3MXaBGPBi5uR8JY1W+gsQherTB4yZfyFcglVuLZUBpiiw60bGmYuhF3fIfIQoZkUEkRhdtHHq09TYVrw1pHJA5INf/C4DH8yEOPZnplHsqnSjxSp9Jllyw6RbfTbY771sUoLnk07z/Bku3SunuErenS+0U6nbAT2byH9CMXA== 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=Q7UpTbXzEVX3ICLuHsgvcZJz98bCplkf+NZGS2XhO8s=; b=cI/bxE7y1Sz3KrW9EWTOiqepEUGSNIFDuRo++AhYW+4DiStDfw5p8PMKtPncZBhYH9qV3qMcWH+iR2kK3P/hTkBlobm1o7vNDOhlbeQImbuB6TmCjYaZ5moIPSI0m6oYeDj80gi0fA7BqQBP+t16iLvNqYGAVA2fGPi5EBRgsP7JAOAC08yROxWsIvXoEoAr4H8Shy5O7j62xQHo3CU+pjeGDwPBIXeiG2UcRtcwuhHReqOFwtWyKTZl1AThuQl52SPrfXumiDNLCvN//lmTPLGrchG2U1mrf2pdHQfcqNbSmL7j1HRo9He0IzVMSiTK8wJAGl1pZvIp/8fm/RV6Ww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q7UpTbXzEVX3ICLuHsgvcZJz98bCplkf+NZGS2XhO8s=; b=W4YYi+KdCUDmnCK6S6/4SqvrMXy6c64Dsw9HkosV8Kt/tBLzHlQNUfRUHnzGPNmcM6VzSkiverP3DVa0adx/7fxCHfcw9w7BfAsk1bcRAkQFlXeup0gJy1FdiFi6JH4Wixz1xlssv14oZ0p+vE7RcMreLzZ8pcal2uTLaKR8Z9cAfbyJgfxRxlqQ0zPUqN5LuR6+jXKmXgHI7lhX1CjZon5x/ENVHM2qWM54ODXMHYmi4WQDTwaav+cFV2+TpSR2d9KwSTTPofcZjRJnSpoxq89+S4yzxDPhSJ5oowdH3ximJxv3g6BadlZmynAjlts65eSrSqTwv64fLxnocg1xVQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:18 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:18 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 10/13] fetch2: clearcase: remove double DL_DIR from localfile Date: Fri, 7 Feb 2025 13:46:58 +0100 Message-ID: <20250207124701.14787-10-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 472d887d-cbe3-4a8d-4c39-08dd47758dc0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: HFwuH03gha09FFY42xg2Q3EILv6cgfJjt2loWsppQt5bAmyptFbAEmypj4w3kX8E2VnPg4aJsBIvjhVWAIpoSGqmdPVnI5etMO9zs6bZYW2LmT2OcbbMGuQnQnZHzGDGxGF/JmU/cC5r9e32s3b67LQvixcWJ4tDWaMVvBd2aGHPXJy2009lzLkVtW2goOyLiJNSDzz4LH9rO9g8hGK6M/bEsA0ZE/szoind950huWT8uaMKwiPKzdRN3oWDO/thR+4tLs0bNmIbvFjFf76sGQxuEKEj3M22iVJO8avVqVOfP+kNiBy4qGVdZHrU7zk9eBJPHIoFzQ5aC1OiEV0KgYoBxEG1jve7RWEFnr/1kOOieDZNsWfrpGQvFSAcnYANddaOWnrTkZ/LqOEgY6xWedSUNWY8qjoHySmftJjC9R5KFD25pFUP8K+p3wRfPdjcYemG3Z/x+9rnL/Ji1QS50z37BtWmXsAZtcWlj9AZKorpiij5gYu3zwOI+IHSbfK2yjOeFJN63tcPAtWObm1PdCc6eyA9FPTlNbtHprsF1tTAAd8i9eUCNINt55/C6Yqy7ZcC8PSP2nNl/sYmEt7tZeI7+kYrHUSX6GGqCrFBEbuQFvIjLd+FmEkoxQ/pR4YGiAAShqsV0vMbRv1bssznU2LnNCWleH2eBGQ6Xy3ZvZVq7p5aW/dsHLPAj/P3I77R1+DjsXWt4dmhzJOnBniti3CyyOmEEUcZru/+rfHIYZtXRMTifCWFE2g/wZM8Rt38PXqsmWEnz23sanbXQYbTG1a7WFuW8AWerkxfWZtcNBLPvBXeznHJDOO6FsUtjTfgAoYwlN10q4lmujF3VVJTShiKPLOCPLqj/8J0m/R3c1C/bVma/Tm4tIx0B6gkdP+UdRJ8T2jqoqkw6uNzVxunhVqFwq095UAKVTJQJqur/QLOyLeyiMK5+idGon+e5yFYt2I3ZG3LRlvgQH/7Y+xf+WZAySQu38gQAPfuNSkh3DUSwYy2BLLdifD3U1f/rpW/AJWCh9N27jr8f02iItL7p/YI7JNJ85AcnqsQL2OmI2EZ9Of8IIRs4HQNRYlciUPyEjwQwproMbaM+bjHqckIbZL7SZW1SdSMi4xnffpedcnlwKGlsYVD2kw+RPk5bOlKgJ1kUYnk5Pwwsi7jtk/hc8ropt+73t0w+QbZIRPOUbiL3itxciMDDhnFJSGq7KH49fn1DC3fpRPdCBFN5PO5GHFxjE7CaOBNpPXhC6qvFg+6RPdtQ4lRsnRkQG4j+3aYkKG8kHNwHFSxVh02GBePGtuTPPXSrFFko+QgGnVneCUaYlkGV2ZURh06PaAqqs9oLrKDJ/Sl/XgQiBx4M2AUewJAzYoF2ku93cwdBgI4xln7Z62heJkl9z92rLLNoft47P7JOuDqrUjQlMjkrv3yKYvOb8N1urOg9ryM8bixAa/vfxF0M8EHPIgmnwbZJjrB X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SrbADW5H/IDsJN2h67lYa4Mij6xA04IWQW1tlaZOzXYZa9pTtD48/0mLTvADHfwvOMqDBYAdtlOK6+oCp+744lwu3y6dLD4P/NmFQbZzxlsuGK8XRtd7E1fufhEJ0r0id9eUhAR3KPCOj0mHh2Nok3bYyFyMR189zkYJ4TNaZyBjnAqiFxhtkcVIanI3U5Z/70tue+/CdiWDcdprv+ANi+ZI9ltkrLLfUxGzPdXbhcog3O8uYoqXG2SaHUVtO2D5n3vOG21H99uWns0zimtPI+jYPGqo12uvrTTRIwHoZT7I/kn/URBbZn4qVRe8fjuHTeyDGEnozb4RHlTs/THSeyvnEoH2vnn32MpSYJxeTL+pUT+65WLlcWmhuMX/ApraE+oW+QhNAjGEqTde2O/cbnFaUgzg9MViotMzQClbS60DT16Bd3aPLy9sKHGy5cKJ/Xcc58olu0SCOaO/nsXhRRPfnCwpj+ihpDuwQ8oUft9gQYxybnFGjUUfCv5rsZhcBhAVOTb5ULiZlTJFYSTZTMHhcbzcUIh4X4BBxgMgqe0uJRDcQ45SwjavjWvtxZNxVi8g+B0wP2oLojbBaNu6qtjYryxtB8gfg+gEPHzGtiZYIVGIRI/TXgd/VHC3uwgTeL/WI0BwMLEliEfYg2gfMk6Fx7oZaKifisDWYj51UwhCEAnhEyvwV6PccC6gB4m4w5qo7WeOsMu5ZNDA6sD0ie8O5uBV5n68yTuoLApiqKIClQgE4XVHCO9GcS8O5qTcAErcUU1TbIpRQ45Wl5qhwMT7HsvxHmRWp8WP46f9nw2pDuja9XTYl39zQTh+27hZgP39nFBu0HgdbayCHqHt2gXajLbfdazHDsQ0Mu/9WtgjSKvDeZuvpstuqGvA3YphZjSFXrk4zbrBW3eVyXwukgFlduAQIIZ9VHmhU18HNOIuPvON868wLU4MbYqKs3l26j8F+zE9+gUdPRZUscMoyHo/69gyp7ag4TJIc2pT/NGhG6h70cFArzCQJgSyMaj3Yg9djWvpfUnHmtHlmcxQo+qXbf4SM++QtuoNTVTsSbcB/0+DDjzf+fIg++bxdqHAO9NMaAqUL1xbMx3xK4BAH//FR3gO/Xvvsqjl9zM3j9/7pt0i9ObHj8OrLKRS7UUFv8xhZVw228kk9gO2/lT76k/0DIAsu5cNJ2pCt0HPZ6w/tFovzkGIyooj9dfoHJPddzYg1QXWQQmEaah3vSOhhg7RnheD/2y8rkM1gGHdNEmzIkb5po0pjO9+CRzqs+pmZ8PhnXCOecXSTZ2/rv3BBh1epbVIdbx7jljKh2OAWoL9gKO3ojFufTKt/kvHu3kfBIYBStUKQlrRykcruVZ1OEiWPJaLXvMtMileVaj671bbmYde3eE+Vf8RLCURZmt4RC2xPgo+Hb1MAYA8/swde8uR20BrSFRA+UzYdJKhihUjhNJX2PBImu7BVLY9cyBtiBEwfmHD3Rx0VrLDwTe/fLohgrupOVTs5BviBIUr24P05hqTi0KskeJBKxk8aw3ehf54+sgRIxh2Aoy1ufdQjUBn3F5VSNXqtu3LhLMJytTcKODfcO72czk7rvtJp447JjY7h0qcU6jcKo9xiRG3Hg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 472d887d-cbe3-4a8d-4c39-08dd47758dc0 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:17.3589 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2dydNjrZVPms1+pXG8AKdvK1nYkoPbU9JwaYw1FVjTibBSM3zcedIksA+mrSl/YHcmaj8/IK+6WePKeEzymtBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17178 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/clearcase.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/bb/fetch2/clearcase.py b/lib/bb/fetch2/clearcase.py index 2b3bd7069..17500daf9 100644 --- a/lib/bb/fetch2/clearcase.py +++ b/lib/bb/fetch2/clearcase.py @@ -130,8 +130,6 @@ class ClearCase(FetchMethod): self.debug("configspecfile = %s" % ud.configspecfile) self.debug("localfile = %s" % ud.localfile) - ud.localfile = os.path.join(d.getVar("DL_DIR"), ud.localfile) - def _build_ccase_command(self, ud, command): """ Build up a commandline based on ud From patchwork Fri Feb 7 12:46:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56850 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 59A6BC0219E for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.65.129]) by mx.groups.io with SMTP id smtpd.web11.68552.1738932444338795086 for ; Fri, 07 Feb 2025 04:47:26 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=0L7lKpE2; spf=pass (domain: weidmueller.com, ip: 52.101.65.129, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=br4I4Rg6LiVuLGmq4hlqdGf1RIg+2B4zg4+Br21bC8vY47y+Psj1AMjNBwoyUfCyrPh85K2jvZWAt9rsXJXnyVHFKGewNFTATpxo6QUUkuYi3xYkbSy48DiM9UvndNDLBaNueu92hV9YSki49nWvW52jy+z8ltkSB1eqduz1k8kiH86jQ7Q3ZF3kMOC2kjH2Cg04tYa2tjL8NXAkoECk+gdLcK+LtO2WVnEPq6E4HeWrwQtmyxhfTUEdtYElSKkJNvzrJM3h3XPAHK+9Wnl3ZiQxoidOLiGwc70N9fvl5zeNbAfCjUHCvoIiXSu2vnlrTN3dbtgel393q4C/c8Fohg== 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=a6ZgOrag8iJXjdOgI/9BpkRMyn+KH3zr8RLFBmeM6L0=; b=WptDtE0flq94QpVLPDI/ewLrV1L0Yf4NSwYo5j+wJel4gnzjh79DABv/xQeVYmm7AGPizX7qYIecfvgcomqla0fNdioEy46fmOXMuSrr8jPd3048l/R5BAhb0LbxnPLgBZpXwPrjwJBQeMEmc8xyUuX2IZfyF0LraOP8VdcNF3wCtgHVwJOhScIEBfBmh0pS9qks2yaRqOgKprlGtyhfkYxS2OrNQifNE5o6o1yrrhSlMK8FWzeOnGppf1JfjU0CT3TgVelk3fncGWfJyGnHmz/u4ezn5ArZ5WyhrDGCttByo6pMkYTMRdE9g+/CAfvpwrCPgdQWbfHiKKQJI8u0cA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a6ZgOrag8iJXjdOgI/9BpkRMyn+KH3zr8RLFBmeM6L0=; b=0L7lKpE2sp6NKZvaGXrs4EpD0JlhlxEwPkzdBwxa3H1zYgLHCCr/HyNssWVmHmEwxtz18Uq03j97ITW5cAJUHNbE1nhaIHb0yUEDBXuSvhcyJgRi6gCOtn0+GccB3qWNV9Dn+eadfjJZlJsj9VJVxYDOdFsj9STDMO6xXUrlM1sv01AO+TTiV6OKbfqmtf47KSE7k0vI6HhWPalEGh2Jp68fKt6pPzUp3gnL4w55CP9SRcWdtyvsEYBNjgRphQBuDcreD0M/sqYHbxzt7sc+13XFGBeXI1AStBSKRUQvrtAP9EXbtljtadZUTZsM8Xh5efijEJKz9GI2VH4h/RcixA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:19 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:19 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 11/13] fetch2: remove basepath from FetchData Date: Fri, 7 Feb 2025 13:46:59 +0100 Message-ID: <20250207124701.14787-11-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 329150e7-a4d8-4b28-a5e3-08dd47758e0e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 9gqSRmZkJurabMVlYnNjytnHLdP78PcBQs/o3XymBOLjC/N9mjQYahOG+tbEBZB+qFlbmSoAeyCoYGEk9nb3rc9jYf+rilVqnVhV78JZSAf2DLjJwJp789E3ZpMINkR6LlXI9MXw6p+Jq3ElnmdBZAjnZ+KCHXUlpFxLjdTYH+P98jU3mXaRVbMr9+KUwfVmykxnf+dCied3JXzlNrP/M7CytB48dFl3L/wPQsYMQTigcrbdLn2tM93686JbL5LMyoyYBeGXCEXe88JUZRz1Gdyb7+Jglgvgqwvcpp13bah9oxKKxPJr782ucImg88jgppPFkYNErQhW+W8NRPLldiu2Q5BbfsGmO9UeO9pDk2jf3RyLEAZVFAv5F2bbfaF5qGrQ/Cw+jJ0qxW0vIL6AIpYUS/nU/01F8v/hkG7PHYN1emu+awaXWUVQIdoJom81TJCvra6wlc/+x4qa6chwCEJXEzI5DHiINA+ofO7lhC+Pk/7HHlPbaphaKfdDir0b4ZIyqFddBquo0Exl3GJGKC0gLxM9Eh766eiFCw1Vb9WAZd+/LXjZH2MDsMcO+UfyrBRlGNdyTuX6wu9TX3vDw4BWUNMhjva1lmJ1r+dRfO6Iz6o3yqbu+886U/e6vSu+MQwOasc3fUe0MxVl85JFkUTRlX92kKr3yDn5vupZJqdA3JxIhpVQnfBTABLzRfCU9pPZCp8aQPlvwU7RqexpDT6sEu8nptSXSpPqwv321/T8He0WizlPAgnx47y2nZKRKYGb6Js9Irbq2y4MDYBDKg3VR7kvjx6k4JxG77Z0LZM0su1pDZ0JApZttwqF/Vs0MBLh4xLF6zBScTkRO+jAcdyYEaydl5xuvyAedNMGoatIsziO24pLKa2XapIJ+vJ0ZKsfV3HRtGr3XcJbnKUP1r1Pu+4e/sBFLzK4QuEHgZkZYtEZ7SNnjq7szWbVWn9CaZXNOgv23HLLvkqzF4w3NOVRXolQx8l9xvuf1tjLtMZmIh+7KqGzr2Ov95dABS7Of8uwSXxXeoK7Z+R2MN7ca5bdESIGF1UIyj4xUn+6dW0MMxPJ+f3RHFh10juszuF4Tye344OK3vcygsJkqJrYv2PeMrmMzc4xJgF/8+xy2XoP+6jTU/RTLHG77xHlaMkbj7mgzi7b65GryeXcslWZg693mcaRAlZN5K4Mjy/9PZJNkgfsF7cpaMaFFQ7P7H23TZx/XKoy4Hu3S6i7cX/FGqPr2wIIF+TeqIWSTx3oQwd6gurOIgh5cEYx4ihodL6+qgNMCiGT6EZ58REd3LoeUlHVGb8vSb/rMzt2puOpCqgMUQyZjIHeCdcSnUc5pbOW7KNYYZ1A4NytyH+Ewy8VzXSPn5xuX3v4ye4diMdqE1EuXmsCnE+tNUiq4pR8ljPBXgBKYaBzD3wsqR6bfb9SbXoNNyT9vx0iLqngT8bM+eFYXW4M+DoxDLiNhT97+Qcc X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aIu/n2hPub4okL1g0/L0eSLhxWsRoJjhham1JYwh0crNRBIE2gGJFuigoVbrbvE3zoD3xuo7dm/sCtIDNSfiy14jqC1sIe5uQW9Cv2JTFE63IiUv5SoF7wH1iPr9/70/cHsLX4YpNWwzVOQK/pqpIHC5zP2O/oLlM1eM8ySn17BtVbIgq1Z6UBg5zf1hL2Cri40ewHGaDoh17kotqVHoQgzmi3CT2NR4yS+gq+/w+OJYaHH+gMaewebooyb3EtNGANA6k25/AWu/q1IeHtxEexx6UVXxgtfxj884t3O5DBJCHPNFBdC4a9Dw3CGoAivsENl9U3LjX8YhMyLhySj2/psQGrgHuSFNmxjQe1MtE7/C+NyilXntVLzbKFe872SdH42eoPnot6X+yQ5KNfp34bEVojzIwcvO/9403/MQ3Dr8VDRFkvAqQ6lF7jikKjdGAp+eArPX+qkC72oPlTTlfZNJLlF8AwW4+Sa3bNOLKChn7lNmHL821nx5pujufuS3/iabE/0mVQ7TrLSJWO7wB4G+R081L3ZJFESrJo8ExpmphLEg+r0iJmxH+LAiGe73j4Ox0WeRwsDj3n8D9lLc8QVfFaNzSr+flhcQSjsND7rDDFvt6gDPWnt4oVJsmYtTk4fUnYQg2+fppxfK2fLja2tW5KLMy5FKqmRyW3DSX/M+jWnlSnV4YIvSFcC15+S8miqznT3wG4PJMeP4+5kjbb1KXq0mn1hXQHceAFbGRfBbkuKDL3fAQeuKft69QResuLKbJ08uYOcRNKBuLJTToov80qOyH3lJvUKPD8uaQdXoBAVEhBFNaHn84IW4JY76BrXnaYCGOwoETOMDlB2JKRlkjPwXhIAbk2MajiZAm8d3aarVQ55rUgDXSipJEB4irxbKWO0et5ZadI1Vhs47OgneobKZWUoCsGFMFk2gf+/vrN3Sc7FuSZy3zU5pMQFb9uBahaIEcKWSCtXtCNNexIei6ioN/LZev5nyM9RIHulJpo8W7p40om1SN0XcOFLvrQ0rcpt8FyQ/dt2XEgLQPjcinNmjJjh10dEbFcCGDRVilJpYMDwkRGP5yuW/LwS4MYCgnpPp0zStBgycB/DlWtDlRrcQUGVX2rTc44UVUNhG4pCzo8i+o8VaLY1uPxSJbxZFjszYB0eQ8f0ZDckWJybWZ+nHzM2cZ0sYj4lRUMoP3UVu1w7tZUhdbSU1ZpV0AqvD2CNc71bfQ19AlSO8Ko8T34EUuSiWRC1czO51lIVlUsvExjb9yweQ1eEpdHiArmq/fBdZRoMZVAeGtXaQlx/AMzDBpKx+5L0K85R2BgI+nsbisqBnYAxJhoagtVnf11V4Wf4n6NggsJqPISrNcT455apoO6STBD/82SdepBRUkiW9zJ6/Q6+YGtHhfTrVkW0r8Fv8h/4iRn1ajNBGynQWnPzAZLsHDMbY6cKZlrHhoahWseAEEgeHWjMtB+iHweilhOFIoofH2/IkUGuL3xHYsIi9Z1X2jHuwIqALOJXSE0q37UetIP9i+7h3lKi6KjU39t7c5gyOTYcCFvZkyjCFqx3efbTsneeRzcD0dKXKOTvrQZRbBehd+5Uk+2HS/yuwmUbhGijv5u8bKhKayg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 329150e7-a4d8-4b28-a5e3-08dd47758e0e X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:17.7781 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wGd87JvhmtTD0Ar1xHXsyXk0+GWvvW8xG5At1EnPCXajb3bRHiIIXQU4VYqxiE1IhWTQu16+JO5f0INmsRuMAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17179 From: Stefan Herbrechtsmeier Remove the basepath variable from the FetchData class. The variable is never used in the class because the only user of the variable also sets the needdonestamp variable to false. The basepath variable is useless because it contains the content of the path variable. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index bd87f18be..a680783c4 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1270,7 +1270,6 @@ class FetchData(object): self.lockfile = None self.mirrortarballs = [] self.basename = None - self.basepath = None (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(d.expand(url)) self.date = self.getSRCDate(d) self.url = url @@ -1343,8 +1342,8 @@ class FetchData(object): basepath = self.localpath elif self.localpath: basepath = dldir + os.sep + os.path.basename(self.localpath) - elif self.basepath or self.basename: - basepath = dldir + os.sep + (self.basepath or self.basename) + elif self.basename: + basepath = dldir + os.sep + self.basename else: bb.fatal("Can't determine lock path for url %s" % url) From patchwork Fri Feb 7 12:47:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56853 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 5CECEC0219F for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from PA4PR04CU001.outbound.protection.outlook.com (PA4PR04CU001.outbound.protection.outlook.com [40.107.162.101]) by mx.groups.io with SMTP id smtpd.web10.68438.1738932445099229225 for ; Fri, 07 Feb 2025 04:47:26 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=Q4ZRDEm7; spf=pass (domain: weidmueller.com, ip: 40.107.162.101, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dBVty/VhOEUAhmtOqycm1VdM6XR59glOO4T1Teo2zZFmccsAt7LMmk7Gtve85RL547fXan0dQgETibOg/0cBrjr+gUIsqAYTpqGTHrHUHvxUAQg9cCvLilUx61Edci+/J+jC68NvPkoimcFk17hPQO8W5NWiE4Rh4N1Kl0QRPAegyH0CQANyIG8mph8OojU6LvodxDE/b/ajU+580ltU8cNaxCYuwl9rlfh1RAG2F7ll0JaAlP3B8DD1OxSj8NiAC2AQRqBc/bN0F/FitzxzxgogF32I7LCxyVOvgmnNGZrlQs+w52vv49SDhVQLVFR5V67e2fyn+9oq4Z2VCkV+0g== 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=RsdvD9/UhgxwS3g3pFd1YG0zrEM04JN+KwTKaAk2l8A=; b=tpUNWDI5uye2ZKh/Yo21FBCBD6R0t0Ey2KG6zzKTCqCF1scWq5fnk9fco1URUboW3CjXng//413jGtwjkb6IhxgoOKOG8lEVMjkxrYaGzW7gFZZ9V3wzc8l2f5YXpP2olg+nbDMIHEPKmWQLObm/OlFt2TqV5STBTqK3GEzmex8Slpzs7JstbtLhoFurhVHMAGP6Y2qccw6DU33OJnVuxJt63j5Msm1MOtYBdK029+cUtIIwDeNNnGZzxddJ34YiESoHtYEGf/ELxOIbUM/7rRvgTQJfd8TzAWtjcFheQIF0gL344IfIXM2kW7Zzt9NJB8b4Cj1G4zgDU06AEJeMMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RsdvD9/UhgxwS3g3pFd1YG0zrEM04JN+KwTKaAk2l8A=; b=Q4ZRDEm7Z/jwcl/1Zkmi2B22f513h4p+BNdUft1mkrnA9RFH5zOH4vi9pPkeVXSqmnarXLUaV4/yOTymxbxw/btGUZ7a974QHTKIFAoHtmoN+eYWUYUb+EyRAAZjTDLLQbN+0Bwo9l6qN99pt5rZydXg1BKUTkffw3V8nk70FxsZS/aJ7+psiGElRDqjfoXYcsmEYOFUmINseIi88Kk8zMtWWak5OePDW1Qgm98tbFM5M/Lxgr8dnIARZcCFK1dyJMeq0oUheETcbC8QvvOPsQZe9+AZ2yT0M/qp/AlhrlkUArlOPA2L0Cp9Ns4XGytp7NMhR/PEMt8GdhnNMJNOhw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:19 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:19 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 12/13] fetch2: remove basename from FetchData Date: Fri, 7 Feb 2025 13:47:00 +0100 Message-ID: <20250207124701.14787-12-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 51ed20c2-7951-407e-6519-08dd47758e4d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: pufKMgHAJqBTS50Ps+LgyqM12m/36UeAOd1Xz6NdJrBlI9o0ZOrh9n40H7IQ4Cagpm/ciFznAhIw4nkW9OLAgCrYqBPgjvPmG0APdmwufc6bJTijME6KqSXovUvClbfS5QVot7MYVfpOac+fDxnoVLpNU6Ysp7agN+SNuRC0/Fi6meuaJryJavAAoJfDyXpM9OGPeeRTRA8Wd5IndO+rQSZyfW2Aunw/d921BQIdJ419aNtHvrh1GrWr78Jz0Us5eKD0RYqY6zSWgDCr2Phx5SMw+jXWbqwf6S5VVEziuPBjaXgcWF3lgBw0C8iXBkJGQA7PCjN0UOvMsgY8txvnIqr/ixc7V+NJ+eTuLaVT0nZUPYTVzBILLDv86dF6zBN6BGQdU0U3ia8L0SKn3BXGsu1Yxm3YbKNmFiqoPThYxj6sDD1BC08m5h5RI/ISz32UNZUoKhJ6Zjpzmn87Qeh4QcESttaddItlpTM/yOUjjADouQwBAojZAG2nld9GG4vOdjtCNTDSR/k0v6Hhz5yFUVhZ7+C650kc8IwroJdrnuj09VPPcWoScdKCKhByylQL6CSsej7jfttDW/F0mnfbe5P35OcUPBx+IxB4+EJVzDzaeFEsAzKeEXbu5FKAOZJKJO//mMxAwaD9g1il8ZN8dsaByTXJ+P1cC03VCyf2E7ZdjoapzqVLHKwdH70VhAmHJIrURYe0z5VCSTze7pMV26bAkbvGhy8M02RZlOOopn9RvUfwDReY/ycxFFsiCYu/2GDyVerSWd5Fr4DZWCUSE803E+YaO59RsM/EDlrT5RzAlUuOjcpBvA5AtAoXM2dcO7ezp84KQmKsAa78OCFuv7KjVNqUm2W5OcUmiyYd6mKhq/+wbNANvbv2+9H3K4ypm5by2vbv1TuCeSeIBkg370Wd+0988eEU+CfIv8U8+fQsafb28zqxNFi9Y3BgJ6yRqdIDepm9PC2SguYEsK2Y5wb8pGodfIYNoVkLa5RpxufGHH17xt5eKqvFy/otCzHZmeLfAPeK1ic0MK1OwP/QUCKC+FPmblUxyhYv2maNFD5qeQvnQwg6WkpE3vQlZWMVYaZQxWjOaQhD7cgq5TiregHatU6qZRgpnI9q5jJ2m2APlLN+2AAVFUvh4cstC5lVH8S6ozYoYIo3tlEyAjHSFa6o0BNMl4SiooOJ5kThPiQBucnY8EpIl8XdUzqleRtSvqTAa/XB1NkmWKeebebIe5vRN74hQxwKqU49LOkKQHECShtsy02qOhZjSlWxzeVL45vvBjcwLQIK3kpsRKyZaKsVZRD8QnDwb/HnLEkqjuTtkpvBwMz8hBHLL8eNfoQ3SOWPXz3I75GURNTiqLGu2cGM93ngLu0yFC715XfRensZdzb8GKp6jqB5nY5yZyteeuygxZLqS9lYxAfvbs7/DW2hBCL43m298KJS/iGxG8wZQe5SQbBNV9spCIy2uf+I X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CdgWxLXdUika4YGEu5lHtpG+oZQzbhTtWVM3Cfd/d4W9IpLsjIO3wRl4ecJOa6NVqM3jn2GAHe0TEllWwi2Raj3qD/mjO2SaB8ni2snPXwuVH+c2SZm4IuthSP4x2Ah2GUBe99Xxdvm7ROOsXn86TEdafKebPu2Veg5EIAcWe/kME3XQdpyCvPjwRO1D78HJcA/zhiqdgqy/0GJ1qkgaTv6t+JxAy5euiJvoPa3u5ZrEYjkVg+/iFVVHvqq/qGjrn/5HIfDLegO/izCmwTdH+9+JzZyGgmMGV9I/3/HP25DryLAIv1bGtp1qzvZ0kFlbvMeYR02XsfUfpSvXJXOPhMx8Xoxf7cu2W01HvUNRTdmo5Kauge+DJKXn8JmKDSeS9anpBkgJ1FlIH4u8FLdM54/v6pjRCOSLt43gagc+6vH5aWvcKdTmMAkZSVXKp/ERhY/KznFoTa7CyyXqaAh8tG0eQYQWVwxCxkDy6xp+8w98VgkPkq7XD2xAvdi9XxfDzVk4uF95goZDJ5Hblif56VAVbZdmkTfJOj34LC3mfXkzY0ywQhAJ162gyF8HJNFfgtGmHEoonr7DisEX0bRe/js4t0hrUD491kLVdd5G4YmGDJP5QDrv4NXwAePlX4B3nVj5HEieFK8OAz1CVRu1N+sxu0ZWSwxzVF67HDD+VuegNvHlsP/s3CUt9D2m1yPYoaqnJzc+SvxnQd/q3qzUK6eg6LvPFhVzXW+WSW536J8sxUp4p+kttn/8ogAih4+WEkNIh5OGuRMbHJrYakX2HCEm0g9rhoWQZOw1O+KH2ynhKDjg6r6euGhLrh/JnEM+ec/Sfv5ccPh0DUJ4727TKIn+DyXyPXpeY0Kk89McksjMDVOa3cS63To60xasbiZ9Kapd4j2cjKTN38bTOWO7vzZpQqj2O3+KRcdrOTmGPgVZdkwJdFEGzCDmVHJoZKO+TDOONnDiM+ZAYy2t9z4F7QwbUQPtyTKmMYtcS2KXexhd20Y769gRdr4JVXz6wwe4CjdjTjfpPOcs3xfCx4SjYRxo+YkUcR7jbcdwI4RYFzWlV/KxgbAeb81C0mOk+zBn2H9eFQFHMt15uBxiEejAqtEyJkP2rW6BTvFtALBAAeIukjqDdiPbz84hFR/NCxMGLztfUkHAZRiICqK+KfYmgkg4eArcidGbOcoXqfZnTM8S/tZh0uEoSqj7vzremU09B9sWVT4X0cd+Q+aOZsof82nfS7z0sTPL6QJxz06P3yYK18bj1WTgKAqE2uaJCm+J9kexj2cBfxGdvO0NBjXLXFZiyOHNbn6c0So3bAI94LG1nhq8GoBDVqtVEejwZGe9fOwDmOX0R631l+NOrWVujmyi4SOQjys/KINbbdHkaLsD29jf22Y0Vz452VEJgtRORIqH1Ee8Izf7NZH21QIMiGB+Av0IzSPdclEwIDTHWu8C1cfL6CpHxZD/q7bM5PbQGPw5RrG11JeHMECLkSWBkXckCFVOoE08co/Px6zVdhz+S75wyxpw44vOl2iB1Hl5hddjma176WyPXhOfJbOMrUwDtadP1PY89A4/upOuvaGSVOzRxqqwQ5jY3AFjag7HXKTCjg6ICtdWjPwAIUQNzA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51ed20c2-7951-407e-6519-08dd47758e4d X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:18.1883 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 596l7anPeHuIczkr5cCqVDB6GpIkuKw8kEsFn27YQqs19TZ42tOwUeh9RC/MMUh9j5ebcHV/CmXGVjxNfeXzXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17180 From: Stefan Herbrechtsmeier Remove the basename variable from the FetchData class. The variable contains the same information as the localfile variable and is mainly used by duplicated code. Consolidate the duplicated code inside the FetchData class. The variable name is also misleading because it doesn’t contain the basename of a file. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 14 ++++++++++---- lib/bb/fetch2/gcp.py | 8 -------- lib/bb/fetch2/local.py | 1 - lib/bb/fetch2/s3.py | 7 ------- lib/bb/fetch2/sftp.py | 7 ------- lib/bb/fetch2/wget.py | 9 --------- 6 files changed, 10 insertions(+), 36 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index a680783c4..de1ab0782 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1269,7 +1269,6 @@ class FetchData(object): self.localpath = None self.lockfile = None self.mirrortarballs = [] - self.basename = None (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(d.expand(url)) self.date = self.getSRCDate(d) self.url = url @@ -1325,10 +1324,17 @@ class FetchData(object): self.ignore_checksums = False + if not self.localfile and self.needdonestamp: + if 'downloadfilename' in self.parm: + self.localfile = self.parm['downloadfilename'] + else: + self.localfile = os.path.basename(self.path) + if not os.path.basename(self.localfile): + self.localfile = self.host + self.path.replace("/", ".") + if "localpath" in self.parm: # if user sets localpath for file, use it instead. self.localpath = self.parm["localpath"] - self.basename = os.path.basename(self.localpath) elif self.localfile: self.localpath = self.method.localpath(self, d) @@ -1342,8 +1348,8 @@ class FetchData(object): basepath = self.localpath elif self.localpath: basepath = dldir + os.sep + os.path.basename(self.localpath) - elif self.basename: - basepath = dldir + os.sep + self.basename + elif self.localfile: + basepath = dldir + os.sep + self.localfile else: bb.fatal("Can't determine lock path for url %s" % url) diff --git a/lib/bb/fetch2/gcp.py b/lib/bb/fetch2/gcp.py index 86546d40b..62715f746 100644 --- a/lib/bb/fetch2/gcp.py +++ b/lib/bb/fetch2/gcp.py @@ -40,14 +40,6 @@ class GCP(FetchMethod): def recommends_checksum(self, urldata): return True - def urldata_init(self, ud, d): - if 'downloadfilename' in ud.parm: - ud.basename = ud.parm['downloadfilename'] - else: - ud.basename = os.path.basename(ud.path) - - ud.localfile = ud.basename - def get_gcp_client(self): from google.cloud import storage self.gcp_client = storage.Client(project=None) diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py index fda56a564..0e9357968 100644 --- a/lib/bb/fetch2/local.py +++ b/lib/bb/fetch2/local.py @@ -29,7 +29,6 @@ class Local(FetchMethod): def urldata_init(self, ud, d): # We don't set localfile as for this fetcher the file is already local! - ud.basename = os.path.basename(ud.path) ud.basepath = ud.path ud.needdonestamp = False if "*" in ud.path: diff --git a/lib/bb/fetch2/s3.py b/lib/bb/fetch2/s3.py index 22c053813..2cf181442 100644 --- a/lib/bb/fetch2/s3.py +++ b/lib/bb/fetch2/s3.py @@ -72,13 +72,6 @@ class S3(FetchMethod): return True def urldata_init(self, ud, d): - if 'downloadfilename' in ud.parm: - ud.basename = ud.parm['downloadfilename'] - else: - ud.basename = os.path.basename(ud.path) - - ud.localfile = ud.basename - ud.basecmd = d.getVar("FETCHCMD_s3") or "/usr/bin/env aws s3" def download(self, ud, d): diff --git a/lib/bb/fetch2/sftp.py b/lib/bb/fetch2/sftp.py index bee71a0d0..2a2a70a1b 100644 --- a/lib/bb/fetch2/sftp.py +++ b/lib/bb/fetch2/sftp.py @@ -72,13 +72,6 @@ class SFTP(FetchMethod): "git repository using ssh, you need to use the " + "git:// prefix with protocol=ssh", ud.url) - if 'downloadfilename' in ud.parm: - ud.basename = ud.parm['downloadfilename'] - else: - ud.basename = os.path.basename(ud.path) - - ud.localfile = ud.basename - def download(self, ud, d): """Fetch urls""" diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index 6cb728ab4..161c66bea 100644 --- a/lib/bb/fetch2/wget.py +++ b/lib/bb/fetch2/wget.py @@ -73,15 +73,6 @@ class Wget(FetchMethod): if ud.parm['protocol'] == 'git': raise bb.fetch2.ParameterError("Invalid protocol - if you wish to fetch from a git repository using http, you need to instead use the git:// prefix with protocol=http", ud.url) - if 'downloadfilename' in ud.parm: - ud.basename = ud.parm['downloadfilename'] - else: - ud.basename = os.path.basename(ud.path) - - ud.localfile = ud.basename - if not ud.localfile: - ud.localfile = ud.host + ud.path.replace("/", ".") - self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 100" if ud.type == 'ftp' or ud.type == 'ftps': From patchwork Fri Feb 7 12:47:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56848 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 4CEC6C02199 for ; Fri, 7 Feb 2025 12:47:32 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.65.129]) by mx.groups.io with SMTP id smtpd.web11.68552.1738932444338795086 for ; Fri, 07 Feb 2025 04:47:27 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=leiSyZDx; spf=pass (domain: weidmueller.com, ip: 52.101.65.129, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RyaXcGkZM+OuLcCoEB8nMi00Jok/U1jSDsRhaqJX9YOTDIRP4ELeYz9j3TjQMt3YPFnZp/XNIqe/Ald48py3uxtwMQenNdajQTQeh4PDGhUckmsyg+kgxbadE/RJSkEoh2Na6qxav+VHpyVBQNAAKc/jvvP0ehowYgzbUg+3GHT5X7oFAnENO2UEqIFGDItQ++q8k6wRqcSUVds7IdVTKKNc2aW2AnJKLgDDbBs7oYCpx6JUi090NYV4gtR7xwHzk0mrP7NCW79SPBGwTFEqO8IJgnVLLYkn8ZC0SoE7amZquV7VOEAI/eARuTzmJ44jPHZqeHiFpywhe00I03txKQ== 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=Rmv7hksz5Sqvz1EDeLwsF0l2sciZXa/WU57kAW17UzQ=; b=zVKzg2qxSS3nGeOtj0V1Um2nS4QV/yldv6iUedKT56DK15fHBWOLSmrPfql8cP/zwE+pO6hRtCN22XTE2NSt4dGpgD0KtT2+qkr+nout7xfAqwCZ68M/iunaykw318c70djCWlAsqlAm+CPeIjKBZ3WNXtXWi4KwjWBP+t4yn09mnZZdKZHVETpfZTU9wNPzcuakcTk8ppt+d9L/ymbN2Tirf9G1HIrkFRduvbz3v+3cJXrPp+6+jqD4o/PaHJUMaUNaBWVbMrzF28F++GT+NYDCV/DF4jbEAP2hHJgZUkf3rGY3oOxCWBIyv/F/Bs6B+oSWVcxR+dlFxQNuFRzAnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rmv7hksz5Sqvz1EDeLwsF0l2sciZXa/WU57kAW17UzQ=; b=leiSyZDxUd2YFHE69rnnhphrE9SBkTVWXBLqk2LEpUHIwuxjXXGtETbX37WJlkpl5Mtv6+CGJ+WJH+guO6wNeuboRmgYpo/HQMa2R+SsKmWjPwaIFiaVBsmo5+mAAErxN/2/Pq3SVeHMjweCAQ3Dg94Ocbkevj53WXcvehSt8R4zmoP58SGe7JPXp3EVmpWserv0MaFjgveIPEE6T1/we/LeqNoIhmeNaQ6XrjdS1e8TQYvXGEBAdKinf41A0xdxETv17X17cVVnp/eyV6pJ3NklZ15t9geGR25Pc/P5eiuXiv75nSvj3OwScXGcXeatytYrkPGnX5B5nsgMQQaSWw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) by AS8PR08MB6390.eurprd08.prod.outlook.com (2603:10a6:20b:31b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Fri, 7 Feb 2025 12:47:21 +0000 Received: from GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013]) by GV1PR08MB8426.eurprd08.prod.outlook.com ([fe80::f9f5:b4bd:9e01:9013%7]) with mapi id 15.20.8422.011; Fri, 7 Feb 2025 12:47:21 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 13/13] fetch2: use localpath instead of localfile Date: Fri, 7 Feb 2025 13:47:01 +0100 Message-ID: <20250207124701.14787-13-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250207124701.14787-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|AS8PR08MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 42bef2d4-3ba2-4f90-d8f2-08dd47758e8d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: Mt9vQlvrvD0qtflV7KOTw2Gnl3TFy0QSgJ7BfTRnhgwlkAa96l/q0zqIlIK4NuA3NvyHTKoNNOMRs+oa9a597Y1t2igJfwzKtGtJUPdI/RBEQ8AVCaHP92vlV0UPXLmvIb+dSOibvdt8FIq/FigvnI0BH9N3mELoyWEdkdg6k5l6JkP2ZT4yrddEoJciomvr9k+KWA6PlDNAg4GE6eub4WVyYxKfUS3tHOiTpk+19IBrNYTJndk5mhsIVZ/7y3KTR7y2YXgo5YhHhLfI/86QJADG6GdjjXoL3lc3SPYMEt1AFYIwIRtlpH3APBFLMp6rTD1KTWqPJF0dh83nIHn8NTaUO5w4pEOXDIS0igQR3XjET4xZDgg9HG9jDOGIBAiAAkrDkzZHfv3t6RYX97gj0JuSGzXUwubmhv1wJ4tXpoidQ79jY8i/ZXizFTX7wBm6e8N2oMHWMcMblOggzKj03ev3z+0l8UOftNn43sqn6w/z2XRYu2DqslGZxxEQZLapYoOhSUzPjRakGNpG/q1OBzg2+ZvMQoVAnjf3+KXfgC+ZKdys0H+LBn+blYVypyMLZ2RfeIf0EwVBQcGp9KCDqKkcNtOKa4j+sEvMdT1tIBMAidHrgj1tVvu+eitK7R+g4bndLOdpcIjg6EDa8t5uDTRH23tc5mRsIZROmHO9TO6+nxDsQIyoDnzduRjeCkYjRyphSWV+VxbzJL0+QXMzQJTz2ZB1E34LE5UZaQ9cGAm7qMEgW9HJNt0ygKdxUuVPr5b2KU2ef1j6KSUtLwfJr/fzvjErX/KKjlv7Trn3zOtNFSek48fLtYihYGMGur9yDKRyczf6ayipq1v/GI+Jg9U3iWJnTMFuLiTVshl/0SM/O5UmsXkUBvFHoW7z1dBrR9ivvfwdBxtii0cmTG07I+to9jAHLew6JmnaO9rOvOMG+s2XuGQ1fhDTjPmcvB6ML8ie5TrGVtwuVPzPiXv9o1j7Y3KVcv7F/mHhHDBFQHVRlav9JMHFZxIzl4h7o/WbKiD1zbc2tFLOlIAQY1K87eP3aRDFhWCaf+FPyob4KY1EBBAO3Jt/soiIz7t8uLiaFicdV65tNYk+26pVOdfHCJgGgvDi5Z9K8Ker2cGxLwXGr7IU0BGwJK50wLAUSVIFuCQguGMkpIEcZNwN4+6Y1BWfOg12rlk4KBWARb7FhZVtTZNo3h0OD9Td6qVO/aBoM8dTv/L72QqZ1tm9AbrsCKcTr1bpHJGsT2oVFuQNI9EmQ6xmip0HZJhnSad+VMbZGvLSunQGqZQzJA6Ezf5pzNJUm5z7+fNTLSwkImWBYj3Bd4KNF6bBuLLJoW1pdfcH6sa3uvyAuLmT2CHAsFneqLe3fX3wzPFi0sHadNwaCv3jM6dT6JCWuwXAn8X4Vk+8OVlt8qPkcDovXQZCIV4fT6T2AR57FMRaMyDwAJKYg0I/cMlyEUZdQlI3/bGQpa4s X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR08MB8426.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SyFx5gJWHzW95/vWopTnFebTJAtCO0H7/2zN+7M8wcYhi+chEuCvM1NkGqi4QCYM0/ticThLZWXF+COHtjUXc1ih8pGtntsqhUDdRh6WRgqt27VyP5Ic/JzRgOTXjYYiuq7p4PBxpVoc9g2j2gDC9Eog7xyctLpLzZzzTUhI/IAuCYj+TWIWI3yvkncbvChR3iGIY5tRWGJhW2QpVdIkF4GCzMLAZoGoV1CDgJNOjV9lsgE4QwD2KQOPmDWLYTPY122ppZXJjsAERxcEw9DfJv+TaOwkR+5ydeeU5SZDzwxr+eWvk8pf7M0F/47MwCOyNlKiKl6Bqs5DEPvVmtHi7YBsCnDbB0+H/3tmWIzqAZX+TPE0/tERvNPYvBdbfFbeN4L3XCpv0h++Db7A2OAq0FAbnDg2oYMPkw5aorcOWEbVqyV8KU03gPKuTPg4obhQEtDt6HCFZ0cBBiF3kKNlyJFwqE5Z9Ade2w82GT8MnmfLncc85O6mue9zTFmy+4aG5tmp+ZgENoctpVXhcBokpRsVHekFHaUncli1atq2BbEoI4UJGZT3BC2eOaoagu23pFMq23XwRppRVsQ2dQzB+ZuBfUvlyhgABzIjTJ1yuavnzBKdwxgH+hwKirRpIXzJi7r6zGbsQ4o5OOb4emH75RZsGXK3NQ6mZjX3NRFaYjyxDCWmv0Yulud85ogEHJBZkLrgegLa/EiktFLxHJHwdQFMf0YgGlNL0cjnZBUkITootj0bqJArDUAEQgOLWKK+GI1tabDp8Ev467Gh/RaEjAll5evCBNzPPE6k8MNah/OyOda8I4HsTgapL3PDYvRH+hTMgtr7XYcSqzEzokBF5Ob0YruKBWV3d3Hs6PVpOzZSGjFxuu2VTgbjHUqDY28tfmKHvJRHZkzsyR7KMM3e/56w806YpKOcmJQOSIr56CjhhR24Z2QwwHi6BTavZgydwQd8joX2OHTI4SSOy0py/l4p68CzNFFssc9BvPtKAA8whB7ksYZutGrBHRQ7Er2QcLk0JswkknORLL6n98Ke67v0DbvBXNTlrKVanF/Kbpm/9OxqmZmJ05AuWRCAXQ8k4kTF9I8IBqqNH8qyeqKxzab5KxAs7DcvvPg2khhsUr85o7uOw76VBMTYmvz/sYldhTzAhqEd+sULDIeLkBCWYHzxEbvjIPu0w2Now1pHLRWtCHoafrp6IPB6kZq6q8m2Wu6nn4rRyqmdSDbO14i6xnFe/ZHDJFtCWJgD+HG80QNrlYQdk415n+Sqhf1Y5UaJr6+Fsr2alfPhiJ33PDBQV7KGZpbUwzIQEV1IJyGKI1eiUJjXCmGoziBr6RoiIc3yI4EO80TK2jtdDojoV/rrGJAZmLN14NYznzPyZ7ES4zAx0J892V4G+1mW1WSnfnGZM2LkDKvijoai1n3v/78od5c3x0MUQsmmtpQ10sGiQUGu2FmI1eLswpu6fvSLIkTR9hN0sW0VW4mDt2RXK4XvtOYxESOBT6Bd8Gghn/gAiKosHsqn9JKt87owMuvy70PoF0yle6lIPBoZ31mEeylFKETHQMJEGW1kgw0P8JQX8ozuBGzGZp74a2ux/WyRb+DsSr2fQJbixK5h6VZGO0LMfA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42bef2d4-3ba2-4f90-d8f2-08dd47758e8d X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2025 12:47:18.6308 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wFqj0yJSSLUtIiwkLOAtWGvNXiiDR71iiek0gpBPoIPs3k0e9NxaTThAKklop3oa0av+KGkkDDKl0d7oXJtXdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6390 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 07 Feb 2025 12:47:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17181 From: Stefan Herbrechtsmeier Use localpath variable instead of localfile and DL_DIR variable. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/az.py | 3 +-- lib/bb/fetch2/repo.py | 2 +- lib/bb/fetch2/sftp.py | 3 +-- lib/bb/fetch2/wget.py | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/bb/fetch2/az.py b/lib/bb/fetch2/az.py index 346124a8b..1f0f1337a 100644 --- a/lib/bb/fetch2/az.py +++ b/lib/bb/fetch2/az.py @@ -49,8 +49,7 @@ class Az(Wget): fetchcmd = self.basecmd + ' --retry-connrefused --waitretry=5' # We need to provide a localpath to avoid wget using the SAS - # ud.localfile either has the downloadfilename or ud.path - localpath = os.path.join(d.getVar("DL_DIR"), ud.localfile) + localpath = ud.localpath bb.utils.mkdirhier(os.path.dirname(localpath)) fetchcmd += " -O %s" % shlex.quote(localpath) diff --git a/lib/bb/fetch2/repo.py b/lib/bb/fetch2/repo.py index fa4cb8149..5c0edf1f2 100644 --- a/lib/bb/fetch2/repo.py +++ b/lib/bb/fetch2/repo.py @@ -46,7 +46,7 @@ class Repo(FetchMethod): def download(self, ud, d): """Fetch url""" - if os.access(os.path.join(d.getVar("DL_DIR"), ud.localfile), os.R_OK): + if os.access(ud.localpath, os.R_OK): logger.debug("%s already exists (or was stashed). Skipping repo init / sync.", ud.localpath) return diff --git a/lib/bb/fetch2/sftp.py b/lib/bb/fetch2/sftp.py index 2a2a70a1b..b88dc5a28 100644 --- a/lib/bb/fetch2/sftp.py +++ b/lib/bb/fetch2/sftp.py @@ -82,8 +82,7 @@ class SFTP(FetchMethod): port = '-P %d' % urlo.port urlo.port = None - dldir = d.getVar('DL_DIR') - lpath = os.path.join(dldir, ud.localfile) + lpath = ud.localpath user = '' if urlo.userinfo: diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index 161c66bea..1194f0e7a 100644 --- a/lib/bb/fetch2/wget.py +++ b/lib/bb/fetch2/wget.py @@ -95,7 +95,7 @@ class Wget(FetchMethod): fetchcmd = self.basecmd dldir = os.path.realpath(d.getVar("DL_DIR")) - localpath = os.path.join(dldir, ud.localfile) + ".tmp" + localpath = ud.localpath + ".tmp" bb.utils.mkdirhier(os.path.dirname(localpath)) fetchcmd += " -O %s" % shlex.quote(localpath)