From patchwork Wed Feb 5 07:15:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56685 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 35338C021A2 for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.110]) by mx.groups.io with SMTP id smtpd.web11.6855.1738739758488645702 for ; Tue, 04 Feb 2025 23:16:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=CDp5xIb3; spf=pass (domain: weidmueller.com, ip: 40.107.20.110, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I3A8MJKapw/lto7VGg4ziUXxDGP/l+VWRJR/LK4gwlTfCK3J9252fPI81eK35vhmeeBaAg4SOYmSp9VKhqjh09NbMmNN2vkOljFo9r2R9WrCJTmpCHkVlZLCP08T1mAitoQT1RcAbovjlCRsoQMkEqpv66b0LzD35SJXlmilZlcsWn1krJUr7HCdhY5PQdhiqx4Zg2QY0yNMVpMR8sqq8C+tQHzlLyZqhwHhlCO8GPHt3N965yw/xd3bR6e8inwBGxOvRHwk2fz5iJsepFCpbMoUZrFuKtjiW3r0g2BYy36qwMHIVOHCwzuN9W1CuiL3SS9u0T7k/ZivTA8028ZPVw== 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=4lVVVjpLt4W01U6YoJXbAaY3WJIDXfcKBbwkXSyPOf8=; b=jTHmtTyYvNUT8JO5MCpCIxD+3B3CgQqJqubFl8rQtZl5Ou63Kweo+ISnvGnQT15lXV9Ycrzgx6RmSh+PP3TlWlj1ARM+Ca5X0PAiDStsIcjcON2VOeaXTjtoGpLmCeFSM5fH+2dqGGRz2j40e0sGAOiAk99Tm8DVryP2JcAPLGbxH3zBvYEsr47m42dGO7VewjAmZWdMCOjD4rj8biDdh7FDmJzVOstNZzPmD7lQn5dJpR9zpoSAPqtST6yoK00kBYhkO4tJ8ZvGb99ceNC4tLnYvHzCkL2Uyn6EE4pZWeie97PuNyQ0p4dsKDixuCqgYOGKEFCRl1KLIMNueZCyFA== 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=4lVVVjpLt4W01U6YoJXbAaY3WJIDXfcKBbwkXSyPOf8=; b=CDp5xIb3ekP4OzlH2rq0JvhRV0bDxWV15DY8jz/NKtiXU+WOmPz8YmnXPRuwaLxm3jBhV95LYJSKuJ9WynBTIgFII0TUAhSomZdQgHHGx+W4g8I58c/uWup1pv+fF5uQ6bAhYzAqjnjRDCNEHwYM9QRueXWrpsmQxQ3ZpY8hf+EKlQOxnAvBQA+kqj3aaKmIE5DXEDkBWBoVv42/7wDVcwcqXiEKKkFGsJQ2D5GyI0XDFIvWDwWwIT8PfS+btzFfY3GkTrtMW9mQOiwzB6c2ZN+royoXBVscGnzR4EwHlKGIPa9ohNK8shg3rwH82UioaI6eUTfqg2w3vrycw0bRXA== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:50 +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; Wed, 5 Feb 2025 07:15:50 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 01/15] fetch2: remove unnecessary expand function calls Date: Wed, 5 Feb 2025 08:15:24 +0100 Message-ID: <20250205071538.2681-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 483dcbc0-d042-4112-20ed-08dd45b4eb44 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: TsvZAtavBlcMsykPQmttiKGHiZBNj72Ulg9z+hZ/1jeu/gzpLGmPFIetWI7LvrtmAehhijKXqXbk2MRHCmxu7i8l6JMFnvMpPS4z/KovimfOthmJ3QmIGs3hT4hTey5v4jLRBpbSY5tBXawsoB0jlzl9WwAerZD87wNl83JsctpNPzxeG19qTDmYqrNn6QQHWJXnx/zdLHzSc817vIDsoc4N5JwykNi5rbxJ11S9mMHmPA2eppEgWEuXUjviI/x6v4ESyjqIcUHGsM+FxRo6bWSS5InGhpsEIisX0QHaClRJ2zJb7yH7iWghh8E8ZAe1Sq0sgPmcihqNG7eY+VaI6u8zPausILW+cta/bQZf0gjW/CWt3B30rEBcVNoXIia8livmL0UQuamt50e4rRdc0oDpmroBXIbE8KU2xNKDf/1Fd0sS/MKK/8GCLNzUIsOthGoE0+Kcs78V/v5QVeowtDFAzrFRPdSKUcEfCz8sNqk23vq7SXCTyhOmKbx1W8LyfPOg9GGZKZSM1oIBfgF8OmICELLQwJCrDjwkeixPQd0hi1RbHas0hXlxqxqzVFuQsCz+3QekI6u84DIBruFbB8cFelkhUYeUNib8UG3XDujuG8+ZAKQgZJaq1tX4RxZrczbKyBxhi21Qav6NB91Mwkfu6Iclb4eYqVt51TEajRZC1n+JC6ggXK7OUDS1ZWpb31PtYobVk0CjQTHqH+a66D59bf3C5p28hc7ULNG0SDD8O4O6bDyJ3Q04xmvCJf/w7UkRf27TTv4lwCPewmDh+hzW6svmn77LBCCGsLQzn8x0tabRDeCkZwjpz0yYcqRZHY03NFiwgXkv2ll9tPj0/fThnRsebBDh+pqWSZhrbOePuLEJY00nQW1blL9q/Vzj9XiUxOpleUNHZo360L7a3BxcyDdRHqTh8G2k7+7ZwnDlB18gnaSBZjk22b29lpjiK67xLi0ABVZsWMv2ltEkdj5FWCJm9dFmI0yLsac/BGUEwz12BCFfvWTuSrKV50OSesC1IC5H0drTNsymzN2BXVGh26o9VkV1frRCxz0cnfFOX5C6w32GXkndUa4QP2rS9FNWx0sz1mcES1jMlOax00sqov3D/JS9pGFmjuaLY4PwjT1bL4SrdPyqHxD6gWtojTIXpGV+mZNk09ibGXcuiVEvMgfSV7Zecp2zP9wxEwwKbNJmkwCaljD2kAx8uXyykobHa+CzWGe+qN1UrrTHoQ/VHYyyz7jNq+V8cwar/0dPjuNHap1EOpunXtfhX9jPD5lnEI8Zc/nozLn0B2lI2CW1rVwqgskqLxFMG7Bzha1/6lzlYL1fMEicaDymw1RTCJwD5OxonF6E8hYe/fSsz3SJkcCyxjiGHYpgzlDvdEXgHVoBx2xlwCiLOGIVuqefa7YPJs5qvFg81fzHKffDXEr573urXCd23+pCy/EGFthqaLk57E+V7bO2lBna09dF 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: J5maRE2TM7fKdsQF2nz/F5goYHq5ApzOXt5CLOi3nmCE7P+y1OXfk/Tbmx4f1FwyT6UI8HrJ3opR7ddLMYbZRLhOFIM3ueBSYYptn6y5/JMrQvDR2rvVKUDtyVWFD1O07r7hJYGd7Bn85e89TKtXCgFDPV4ZmJTqt+iZpKJKWZOiInQ+7HL1jobbu8XaTB7Pl3E/0OvLUeJjGkiepm8VpjKdDGFI8Pp1sqEyf9jHlGG4+nxPzIfhA9LpGFwKBI2aCyB2kAXH+Ba27k4RU30zyvnKv+LTuzvk2nZvix6VJNp5HOcJQFP+6hKVycexm60tLU6zEaoxRzLQNbdEEkmyS/lr7B64sIweiHLsnlf46IrrPDLvprHYKWtBluf4Pa/47drpHbpNUE3oZeBIbcmxDtt1hQ/NY6yQk84UXCdfiTxdPjXr223JxSe29KRGPvZ75U5WEDeuragZ7qO2S9+DJo9ngF09iDupVCm+UCBTFPXEJjLndE/wuJKNJ4KZXXuoFc6/79NrA3y82czLxiIgd2jIBXIRUBG3Er96luZSeboTNswtzQgOZCgaIjyJLK/Mxjo/6yIoYB9LfAP78BELml/W0FdYkkUjMl0Ugyr7YdYxiHsqYvgNCyt7KZ6wL3xr7pzQAPfV0it53GcBp0QW6z0zqVbcKA+epTfw8ub+Wk/bpDXRKyYIID5mm7SF8OXtuFk0XrkH0FS4rLzXSOzj4ePPKeT+ZuhgiiNVlgj7NH85p/7JivxWvznItW44hJD99nyrEGyD7pe2bqBf58fWnlw8N/SXkshJgK4Dz1O45n1JqCuphxgra3odlrYPaZQEhRpTna3YPt7duWoyboi0R96+R9Ca3mXhfQZvE8mLelOtYfrmDF2+AmZIVgC1spvTpZ+xlMuVCNa5wm+n/W4aGGjAPQoeSOBCw84bvVl+n2//Z4XLm2hcH/jHcv9zkyxZN9Ag7Xw3ZNnfdjreSxK6dUT9jw/GNJHg0ldymeHmrhVIrT5WfX+TT01jNt+/r92EsPFwDIuyOuoymF+F/NSVzAzs6BNJAkC4dbPK8xFPqGKSKt83rqTueFGqFj7WPFTrG0otHh6TtvAzeYpEca3lVZGe5TviU4YFDvDqQPd+RKVLQLi/oHFLg+5p9ZRA+7nOo1G2nhKFsNUyTcvp+dUWbqFcSBanpg+EhqDEhZzqA9f6d9hi8pq1ZnzE7HpbzemAd64zaM0qcuwMbK+MNV0lTMgiTGeZ/sdHQd6psKxkLDUxpJt3+LCZBvzpabfQMF6n5TF6XEyO9G1bz+OKbD9rib4jngOUJt5M4NE5TCpvFcD6rTJveWXarP5C+/xK33mGGYXXXWPYHYvaMawfVfXnFFsQoblXaUxaJnrf7aufFH6MnYy6RY2Bxtuw6gEid/azi6Dp7GWeV3GRqLvwvr+9mVlnv3CcMKryFoIpQaevvzOkBTBNKLrnVLRrSzTbCXUKQBm+6ZGfpHhFWieLfmXor5ab29td1KekTqhaYOdz3T4lV4C5I5zCoLqNKPVLqRdfIDp9iZ6RyrZhPof4vNpM5CTBIplZAz4C4Mpr+tXYD86U3uv5ZbdI66ODCRlixUR9r+JyLKZbM3Lf0+lZJ0CpAg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 483dcbc0-d042-4112-20ed-08dd45b4eb44 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:50.1659 (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: mO0JmkHZs2fp6L2yZv+mZRg3je1FcTT6Wgq9fKkFInnIyoPxub/OuFGux7o0POtF7wDOMRD5zu2n0SS5rxzjAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17142 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 de36f06bf..c77155a1e 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1182,7 +1182,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) @@ -1817,7 +1817,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 Wed Feb 5 07:15:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56673 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 E76FCC02197 for ; Wed, 5 Feb 2025 07:16:05 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.128]) by mx.groups.io with SMTP id smtpd.web10.6665.1738739756512032404 for ; Tue, 04 Feb 2025 23:15:56 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=e7/g5GIQ; spf=pass (domain: weidmueller.com, ip: 40.107.20.128, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N3HEzJ6THiPCDhrswIzfQY0p8WxBYFasNWlJkBzBDp+Y5nfNhT16ix4tlGlOaFdSK6IlJ5x712zbnVWCMxVPMhIimxEmQUL1KNcWoC3kqH3GiWzS5Eav0XZfnxROWq3fOC5toq6y21qJ/5v68LpJ7wrSMgNBIAt2LssrufcGqXYD2W4T6RTw1jrTPidQJ6peAcycDBp7+rDuKC5nPPg0UdHm5jStMEZcdFqq/b+h8kSjkTgKKOFZdUW9B72AffyF0hNLGaiU/Ml+s2RdvVNraRDoOSFyBvWCnG+c6KMSlwAptB9/QSu0khHxAl0ywxl3En8BvwaAVB7En9NPizZUjQ== 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=RI4326i8VbSUlxv1GMyM/lMXqvQQA7NdDYs8jkUc0ws=; b=nJOOf+nl+ms5gV4jVkhaIEVstk3DfDwsApfiU2bRLtky9/6+QFrpeG3N4I+iBOsCgugTDAk7q8KP7obtuHYjCUZZTQZRQCopgoC6hufD1w/NguyVd5cm22cLTz9TLbFYXCzrC+GeHJiobHIR/NR+5MLL/9/ETMvjt3h84P3T/otm9NSS4Jo4CJg6Km5tbXArzNh22DbcRwVsDSyTO8EbgXlf3xsqbmF07+TYLCRGWVyGIvBRTuwLnHFCa6RcixEwHo6UMGp9M9CKHPB60vLI/KUK81sRTwU53u9MQs8Efv+ZV5gDqt0V8o21bJmBla9xMJUQD9X2yOYtAZOyZrfiHg== 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=RI4326i8VbSUlxv1GMyM/lMXqvQQA7NdDYs8jkUc0ws=; b=e7/g5GIQHKvhSo34oqMWOLRrJB3c/LgoaGiDy97zEHhl7mEo9Eo+O1vlof0GiHL5JyXKt1XwrvnTMlNLV+0/LG1EyRi1rnY1KvUkGP8MNCxv2GdSAjC5/BeV8/eAhawrQPpAQHwBoT4OKkIPQ69X3IyOoQ8WjidYA8u9ScwmZ8Z0/76M0tfVZWWLpxlNdWFmtDNYA7fkt+tsD2BvOzqCl0gvmOinppwIXHvExuEtZiRECmiohIGUrwoV+w44TU6vlyxnmZzhrSnw181Hp6/xYL0PfkHgrDmob1o87Dgk88eMuxpJ+kNROdw+Weawf4S+DYvaTSfQw2v4dBT/wIrfSA== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:50 +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; Wed, 5 Feb 2025 07:15:50 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 02/15] fetch2: local: use path variable Date: Wed, 5 Feb 2025 08:15:25 +0100 Message-ID: <20250205071538.2681-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 56bd9bd6-c0e0-4c14-5f50-08dd45b4eb89 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: D9xrQHHmnMPREgJpeqzH+nc9+2Peqgd+y1PVvki3uamEth9jy1yWfLCXeAWFy6Cc3wBrzcTsUKVGWzZ6xomYYHOW7kJD8wa3as2Hcvmwir6bcqVQ6xNLnDVnI9FjvD8K8EtdvmZ1Xbns2vd5IO1UCXbm2wLufETUn42LkIxWxiefApg243IP0BigewNwFep8syuE0Je1wWeZXxL3MgcCp1COIIKdBFfrpA0oLcTh+Ne7thc+uqhwsNmVRQAm9xUkam/l1wgq4K3jZPJHwrfa0YM+NXbXR3hHXpCmHM297kr0QpZRcFkqcW8dVUkGsJqwKPQqZeIxAQ81fTOnUtNQ70KwK6SqpWqTq4Fb3y+HPOKjNpyxojeJVrsqQexzDqNcuvVBFcc59sn/0f5VEHQSD1bRKRidtnUePXQR0t5lIrrlSg5mYoPD0RimJzfMmL3HrHW5dpRybU6UGSqM0NMWYDI4ObHpXKDXI9A3Ky6xXqjaGezEOSJ9bG1NEULmmu+0LtK9AZl0f2EFfhsOtIkxDxP9KSFRPk2rRA+s7tYU/DIBIu4Ao2/c2Zan3RnJIW6r0UmbomFFlaAMkY0p1K8XZmU9TYUo5e6rCB+hRRVK81hY7rTE83DLpiFVbIYhxtJD/by61vO6qS/luSHfYYpdtzFJS9OVZk6QUxUkTOLouIlR1niBbUZ+ZcIwp51d5s/RnE0N/7TR4tg9bew1el8xFhYqbVxNnq8PvyPa3VswAfn+iYrYbv5kYBCF1gyh3mSM42G1+DG8GfGUQkdkfn//rDlUbNjr4KxAbml+BsI2F9A2yJCXc0SB5/3ifJqvCRYI05qsZdMm1Qbi/3bx1AcoWXROODlwDIHuA/b9SUgP08TCRqJwwDG9quF72K5F2wQMpXkFySr08qM8uGjIyFaFf7frfVbSWAADFC1XeRl59oZmMj0z/ejwUFB2Fc3EexJxlANVJYhQee79/1DlDIRR1K7RKaWdsZukhdpKhGFcedH0JMQGO6l+emrQoRxjTxphWEmFtnUN8onyTMZF2h61L5ISqsODvGtOkDp4pNy5HpyG9FU7gqt7PJIJ+xiq7pgRY2k8tZB0/zFwokxDAS1JzkBtUT9rZlLgizjQg4FNKcp+PXI5KJz8sChAAceTBVjckTyRRUNpvhtlTUFherMYjLT/I+VEbnMeKFURRbvSebgAqm5l/+bggyx3tdFP63oQ7Th6TC3guMiyDMUnn0uZy2HG93HhFMSzPxW4fVMP1C9Vxx0Fa3G8eSmSuPapULbktOtcL+fyAG/lk8vuphG3NDrXkU0GAhZOZZAEkoor8C6nEElZrinNEMwf+nJnDujY4WwVnP0mYfW4ElU1Kb12VheMbEJYE57AGcfPscrz9+BrvdiSsIK4dOfRCTmhInpnnOuM/5/+zZHBPFmhYpKqlEXlNAYx5o7+P9YdHW76RP5/X8X+aUigaN79BQa1+bUh 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: SfH4DxO2bawiarRTOkyXAhmGBqw9gGT2ULHWbZB6pZEbpgQuXqqHmmgJtZCVm3Q4vT8WZL2iTmEyuvhOxdoL19UvHhdv+GdFs/17AMksMgInCgufLsGJPF2lCiZeFwhNiBbe39cAKGuEfsAXSzLyCyddDPkDDCJs0SQmjvGBN0LOrAzxiEjvmyVkVmgLRKRgDlGnzOKajW3RWFCxl18InqpvZOSmcl+zxlkpKHIpQX0ECkJMNd5x4rZjpF4G+X+twO8r9f1j1WwmbocEZF0bhmYYjiyIwhnKaFJ3gvFYqgFU+unjwPHpBKpg/TgtWzrM1jVg761ltZSHDCU8E/T07dWa1TJJX9uSHgLM0fuWCxoyv4eBsHc9o7+yDxec+XxcjVV4vnaHKwg305nxLOavnzbk9wms43O96O56vYDsOdzLeH9icVi36eF0UkSm8uoJzcXysvVryHHoApNc2ELBUrmQUUeoO6W+ZQ4si9etgG0ExeDRrU5ARPUcSioMaF1yr2K/jyE0mQpLcCEPP7mpl9JwJrxQ+jr3/g9Lpe/hEcBftrVTgIY0bzCD56s2yNK0gXtlxLyeH3fb2/gOgPltWoMOB78DjsiZqtLOOH1xLk2cEcxsTTn+1DtMfqW5pmumMHzAOQ/q1ipg2Mc+jFua57vfF6bV7Qx2qi43blFYPFSx2xP60golrXa1o2Aextqa47kglDRfUcAzj07CwNMqV4oc3KjWaYiHJlBH//qRjnoG1WblpEa0ftXAPT1JntGn1RnGon8ZJFuR/czvjaW/w4kXeFvT41zK456hjqrAoRr17bAGaR6yTioNvQwC9oP+yr1SddBVa6XZKFQuI8FoJcyKEBfUPyo6aHbFb2B3SbJx3i4Nb4a1bWOMHfWfs1WXhbzvnHrMGNyWNz4WS7nj0eM6NYyZV0t35Pq4IMSeMTF7z3EI1RQKocy7EqDwXK33MUQODoT2FrDslTPLrhhoc3aHZdeSZfUf7yYrx7q30X4eK3hEIJDKpjYYNd6qvukVbW5b2vxfELbg9W3UG+z9k1FQeSw418D232ESrLPadIQEVOF5H7qt6Cl2UOv2/AfT3VphQMJe34HXSedUoifFfbZZl7zxrlCW5bBcpVrWWmbdTplJeaBiaM1QvB77ZtGfw/GrHjHahWJvHVP/CHvuU/CM9JMZSW9k9geQb1zW350MV+VnH3450MUtAqoejqdzds7PLknYuTEU/0FpWyKyObLVvnRZ7UT1rMWwg56lsU++Fmjn5l5sSmSuwjjQRUFMFOAW/HAQWpQEbjAP2pXV+sBjwEtBIxU9YFgHQ/APDQSZ1RamKsSTRe/UIz6b9yjQ6BRnIEwXu0J8dyLyMjhqzR4fUS5rP5Yyv8dPll29WatFR22GE6i9J0VAMB1mtC0fhjd+0ILagAFxcYH6hCCwOIY8KJsKqOBiOIIDPYmF/q0MD8eMtXsaK8PTy9KFKBG8a1q3hXsmf7P29CgjOnUzxTDGK0/eh+zB+cbxnj9MgWuo3Sm2MebFDuAufv840jQsaKTE59RszS2QjKCJfymlkCTEuZWViX8QNGNaCqCQqrp2KIEPdGgEB28g6I0Y07R+PSpknPF5jom0D0iHPnam4Q== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56bd9bd6-c0e0-4c14-5f50-08dd45b4eb89 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:50.5959 (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: 2To7iEhf/nY0GFbzE5m09Kf2T3S7iAVegkN12oVuAUjZQ4I2rgNoEi/LudgrEfIokbYcWsp31jrbnMTesx3cvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17134 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 c77155a1e..f282ecf17 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1271,7 +1271,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 Wed Feb 5 07:15:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56681 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 27877C021A0 for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.128]) by mx.groups.io with SMTP id smtpd.web10.6665.1738739756512032404 for ; Tue, 04 Feb 2025 23:15:57 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=Mu9RhAAx; spf=pass (domain: weidmueller.com, ip: 40.107.20.128, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=stApKPUZddN6gknD+oBcYkB7gGkg8mXnpudoTs5qGgwPfFP7k4XytZ2pjHi/aysvhM6MA0dWdiMHltxcBJMOxuLcCDQ3WbJpEykCJ5m0qb1W1yKZOmtWtJELLXeV8+Y+sD6HntJw+t+dt+zxiszxKncks6MQanGJQtIbJ0/rKHmSW3pbUBVEeUz1898gSo1aMcvRH2R1IMRKqF+q6/ARtTlKUIaauUbF1anznfsu7Fjm0nve8wflxYeoWIiZzUbpU08Sd4IZerudimi/u10OqWy8UAPY9FdB1kuXvdLguJTG58SRAbzF1Q3aVe+4CZgLE7nLa5JE3nqzqrD1FsFuSQ== 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=GBKnxAeLtisiGzUNDPad1puggDcjVJndUaE8Nb8eejWyan5SLrxhq0uLehXU+SNzPtIKnRrEl7UpU3ihG9idYNgM36QD3Yyz1qCF3A0FF3sjA+Sqxru/E2AbOhr3k0C5lznu5KWlEESBRxvCmGeiGTJyiDw+ktuRwGrgDAirybMdNo3Sj1Y2h+OwpoUI9D2RdsrIjpocOCFLKc7eo2pqFHCdj2RP4196DwaxwY/7AfOX2TgDeWztySWjW3onaqsECYISAtjyGcGG4u9whylqLyz2SE2XrTUaA5owE7FQRKFkurANoEVoYtkJxcNPtcKNzLQVXR/ugYeaUTsOfixFiA== 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=Mu9RhAAxrkMLRQA2b9/luw93n69iYxBbocsA+YA93NOkcItrqpdaU3gVPxUS5kGj3k6G590u06OUKOHslXn0k3dohXCx/rApkZwQp4Fbx2TXDyLHBs5FbCNWZcrlCJ+GxUnjdpzdEzPomUxF0i8mTZZwqVfX+jdPuD59IpoL8mCo2gyD9kDIGVAZDGmk3tMoTWlU0sACgv6o2fjDhKps6zx3f8cwk1GkvZQReAFCcUJxkycEX+31X9jz1UGXYmWr8OJgVJzKpmnRb/e5XLwuVfrt8iKg2PsK1j0cuYvRy7NLWWl012dt2DCxAIheccYBc265ePaEtd6HAdzj/o/amg== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:51 +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; Wed, 5 Feb 2025 07:15:51 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 03/15] fetch2: remove unnecessary unquote Date: Wed, 5 Feb 2025 08:15:26 +0100 Message-ID: <20250205071538.2681-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 29f4f1c7-a5ba-478e-4ae8-08dd45b4ebca 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: LkVeTrXwnhL1c17C2PQ8jRHIvrR6tPEVSYtzainTc2jsDreObPMXlZFlNIT6l/b2GzVtGHjr3AkGskEOLvuUNKCsdleN/A1iXPoa3jgykm8lUCyqtrQ00jGjm1q11tLusfFWemq08b+ytPDPKXhC2gFB/iCUGPc9ZR71z+sIS9aZIQuK8qyCTCAk/mT2eKVaLFZXz4kyl+TOHrydWG51VfXKTVZd8MAObwY/oPlnSx2JTJOPgCGo00KBtOFSZyhG2kpdDTBrX14qfTCWniDHT7kc51p2Yi3ZWfTDUJTNpi9BNeAaplxUgYVVB0mGY/pn7WSyukEbdKaq0uX+u59v5ggiImwhDSbT9KAaQYbBwq24z0hUla424jKBWQ0WivYhiqMq6bJvQQj1PxO/Tdh3SCAaPNaXrt2VhbQ/F5tsPhD2/TrEPr4ZJMKl0+wF4HyTt7yFkoS+95c9NW0ZIT8pPuTP4d3emOkN8cl/xIB40QZCkWgA9108lKL6oObvXBPVGIm2vgUqbknHAAOfuOPJu+PTB2l9yPbtUXHqDHaB29+UDPSRK+4Eef1xALWnlII2ic/Web7qWGZnYe6bbz79pF+J3kwaCjWOpQ+YVyF5ItEK2gJ9LsSO/uuZXpzRoIrKWUfyWRCmf8/uAFmh+Yy4wp7RvPl5ZTdxMguXTxiJ2N+7ipzVRTCtfO2NpguI9eGeSx/Pqy+m4uPQkbacNT2XVsnJsJ7Nt1NKCSzwhSfNznJ1CHgMp5BMmKRB06swLQnlVSpH2yquXxmLsp0kRsQ6zz+V6I9bZisesAdu6p/FnfBpotd2ye5BpFyYFCNGfnzoe5XhoiQbfHRD/z39zcngSW/tyNEfBEFnrtfst3V3ygFWaV4e9fTUfpSBAIU5ApCZEdDhDriQ9V8Z+qP5k0MjhSqt4jf+FpQLzuifNtzJd0k4//27fOwSX5KeCn09/M5jGnwXzyNS67b/978jyVA+68RfcAPzDgMTGvGDQIBK9Ltkk8B59LB6CRrASRKS1yyFCwsaJlpTpABFHoxPDHsMtlDMhzuLAciap2ZfvlglejDYDYiEqTW2taXTlthbpiJ8lt/T0L3/xvtxRm8yO4xlHbwGWErhhfcHoiXVaKOQgwYk7TGB31dAxyWSwZy7gX6UVESuW5HpdvC+/D244w//JKmvtku0D2oWupTrqHA4zIsvsZ6sBqwBqO72uSLUV5Jao4qRZDB1ninccR49XYvvINpYB76K72RHBRBWjXMKdPv5H1iTVhz45iVgMjY+44Z8E36Nut/pTsVBsl8ec4fmGbrMNWCg4zoz/8vNEC7HSOGcvGifav8GFMGSPj/7pHwYIYqvPg1J4i3K9nAJkKfzNvKjWP3GJjBxzJT9u0Tpo+j7rL1ST2CRuP0WcR2tb12HZVEkKR8OgoIxtfnui0qiHvOfjd/pBNym+N73FI2rut3zgwZ+1dcfjGVgdrA4+gdl 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: R+aHlWkwgsJdyCtobdxr+ZITViXS8OY8StYgWgQT6EboL0TOVIweQ8YmeQrHDjDcEHq5LjVS08EfF0NaV6y07ZYZaEKaIZ31xDms+ZdFW1mS4Ax0pvfpSWYNxo7Dt3cUGEx8QQwqm6InMD+UK+TZaGAgBh6TvzNencMJznkf2Tc+vsd/Y6qvXGFynqLA4z8o+lYYeFvsPySQQE96sHDnNgDpbi0w6npI3SjqamTHu+a3DOoXGwO+Z9++MCXwr0FnqbWAZ5O5jMsAc6PYxIlezxlQCqhkN1KvnBYiI9QY0PqzEuvuk7+CJP/R1e16gJtS0cCzWuGFaUuqfTxIDH4HmB8mltHwueQJ/WKzvEyxGgqRUeaq8Am3xdHmQ/k3KAj24PpS3OxpJouiscWeAV6W0CEOpp041IbxwbiISYeeMwqfLS8ByjS9aNdFoRbBI0njUs884mXXrUKTwxu4CaARKC16qKWttKOHU77MwICKZwoRiLyfoiXkBhX4bKtA9pD1gYMVK55ITMtZ0wS3O20pXjZF3yCwF6FEYg9f65ojjPrNUFUcjg9QGeiqg0+dox2vExktCAeXsDQOCCljBOhbPm0x3Yv7TUvtkgu6JpTUmwRZ1WigEb+m6Axyzy6kiLW8vcK5fqtr6YD3mQzZR35Y+n+r6iLdvxw93l1v/Dbb90EFWynWWBTjB5hH0w58dtGbbYW2DohbUxDiuwshlEjD4rshzA5uCNDVwCcCyrM8szxjStd/Uan9uRT9YElWQslawPA8clcXw1kT7XBnfyFKdKoaJUsHlvJbusbRxmPs/3rHbMewTLkydqWxULmcU0Zj+3ekg1JXo0Jvw15Il+kxqVaQZhqblnqr8iYA/sSSu4ZANN7YyHIrhq8/vEZWWSrlxdkgM214PSM+Nfpqr6b7bi8JGkHTrREvpfDgIpDMNd655952tHIzGoM/Sgz42OWJ4uXCApXfMYt0DRJN4t1rKH578XIVhBrpkKtiC8IpuCMFypslpajI2XimLibOeUzmn0pnUEcaGIgvm5y3ZyuB61mFTgFa9Ub0dpSjl5epbZaPfke0rsGK6YGNmz6nS8a4RCRETCoK/QEv3oxbqLpO6unmbUFANnBNfKkwl7VIM0dPeMQet2mWfWccQB16KNcERny0gCfA4U0lkeIiyBWl3M5i26fPaNA508oczdXoNELJooIG79prVhHG7xmsr9Ma2rI5i3z0W7a9r8+VzDDfy2N7jcHRg5ThEcAxAiJNuGT/H1GuN4Rz7fXt6fPa7MMCQCjE49yHXOC2wOhnpFpe18DOk2houW00il6T9OT5AbZm8G1rXayXU0Vm2LcanUf2G74Xw97YqBDeTf8JZSbFVmrAhdl/l3vh9lpwuhRrUx0wgQs+UhlzsPu/Oi6gT5+2JNORgjELwexi4LH0RQYbN/MDCAj4aftJXunT0XnUaIMdhJAhNV6JVOfRvAnKblZcY0xY4+74o2d6rN+SDLWQEUPqQ+1JJjQCZVX8wrPhMd6QuegI7nKlRWLKPVx69hgKKfepImrzYkmoBw5h1Kj1h6I9lusCVcjj+bKDK14hPKSP7yEQ5EF+JHqgSHp3iMI5AWUjsR5JNGT3HkIKOePz9Q== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29f4f1c7-a5ba-478e-4ae8-08dd45b4ebca X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:51.0189 (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: 0OsG3D7YLCOBytcTGRILnM4YnkDppXtGtaPuvxV6oxvrG+5k8PPxrdYqL3eBHsAUgSG0sfrWqceepbzfkIy1Lg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17135 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 Wed Feb 5 07:15:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56672 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 E86E9C02198 for ; Wed, 5 Feb 2025 07:16:05 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.110]) by mx.groups.io with SMTP id smtpd.web11.6855.1738739758488645702 for ; Tue, 04 Feb 2025 23:15:58 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=WZu1NNhq; spf=pass (domain: weidmueller.com, ip: 40.107.20.110, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JSinEEm0wpDF1t+QQZEQp9Uh13xSbsiXzGkqBvLVdUuUkyo262+bHCLN1s31WUCP8ECAlVuXA0p0JvPu7kaqNJ+0UjtvtAlBBaPy59X8bOKtmRfOunRCYfICn/6CjwW1+4jlJ4Iy6SdV862yQVv/PlnqzYHzC7PZc5uM6y9zjCRTz+sTxVIiuLI0IgAPB01osj4kN/1NQRLLEapCqu1zo74sc3Li8PXSzffiHnegBculb/dLxmWc2PrhxltY+7mVuSvB3/Kj0Z5OCIvQEF6on9/7RNw5GyDc3Gs2s2S3KkEjn1ftVVdSuHDavQbCFedjWGYc7TYBnizMezvk9PeDaw== 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=kkoR5zO1NY8uXW+Zohw9RI+Tlxxfz62DFJZhIeRuRbVdqlbRT6koZ+szz3qMQO7ALwfii/4SkEi/tqjqHdeWWKBKro1cX1wN6xQ+0es+/GoFB0w22Ig3TRw6MOsrKkNk4lDTXDJbXggzMIRKivkMYPgm0j4XamcGlkb+X5943Jaj7Jpo0OxkyQWzONF4RlKW26uT8Nv3JMjvllw56M7cpWipjGwLM49Pcp2+h8mLeNCBQz/VCuToiCJwX8XeJYgjB2xyKOjJLcgVxy0UX4x0WBzpLpkH9VuadXt5TthJWgaA9l+w6FXgZZRS3apHt3V/or2RWReBcFU9a6G/rHSdFA== 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=WZu1NNhqPhzFybyORmji7+1EGOq8ogtaO/WE8dqM/Qm30neMXvLG0rOrL5uCVfvaFfJRsAJUc9OQSh18laQ+6fqKSkOB/bED8UTHpQ1ZSk/LJnI2JhlKovZ3v/oG37EKazW2qshgU7gKdCiIgq6tnkqfW+KAEQZVZAMKDEqnO88fo2xKEeUurqLhVhVWoemkz4xhSBOkMISPD5e4bmcFsS22X5e+mmPC8OAsZ0MaSv+tSQg5k2hQIGJx/2TYA1+Wm6WmEGegHRHLImidR36a44XiOFtP6qPjqsEISAzk20f1TVIIq5+pJ5v0eckD2CeSg54m9HjQcqCe7X8RnI7alw== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:51 +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; Wed, 5 Feb 2025 07:15:51 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 04/15] fetch2: ssh: use common localpath handling Date: Wed, 5 Feb 2025 08:15:27 +0100 Message-ID: <20250205071538.2681-5-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 995a10ea-e7c7-42e7-11f2-08dd45b4ec0b 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: Kb9ASpgcO3Da+gAQSn04gIfIoqBH8iIzOJkL9wqP/tpP37Ftpt6biHrBp+0QDcQpdez+1Nf56hrqFJ2BR8eQbLIfG/6PlAxrW/AcWfdfJfEVZy7AMAfPrXlyI9g/RWhEzf8GbhFfBSX5IGFpxPQIgSoyd7rRb11jgRn8/L38NJQQCeUfxnOCC2ceOeKTSOQd41k3/s3qXKGQMbka4qiq1LJpkiHV4Zp08Ku2fSQNxufXLfhTx7Hf0gw4s4frSTMLq+TCFmvr4ob5SxE3DtLUpaR9aPffY0GX43/bXYE6Th77yw0hmoBwg4+H2imBacKqXQXWscrmWkWZJEo9cNfK7U49EcFjDJvbrj7HgeGwX2AJ/pFlQPMxgoq0a0w6fbFRRMudZeOwAD7HSJrE8CIIZtLSWnYl6n049a5fPqhZMO9ZS1o/x2BbWdK4dxZjTWgjegLmyijD0mWkGZ6CAc9Z2V0pKRCbCaSXVlzbR9durtGUfD9qoLkP9hZ5y8mb1W5TvvTGGthzH36p4JQfGsNgNSjlRfu0gJRpctcszDG19bpgy3xddd07g4mb33kqlVufrvJjD78KaJ151kXxgr2QAU+i75HMzA6rLQWoCsN8seFwg4GxYFLsJ9AJF0fum7HmMdBdOYMxV9WgGua3ayoHnmJPPZ+DBL8PhYYjjIblR3NfaIIusRTdrwAgM52Pbf/y5un5GynIOdMOhjnGE40p5bF7GL36QHBaB5QSGRLlOdxmxn2Wva+aEJIkhPaB3sfVp3LfO70zXCdWOLsbH5rANU2VDJ9ygn69BG4jkWmdgsHz0taDSy443MDxtbnDcHq+7yg8RpHIbhyGTYQAi/OXNUSJxB2sxCIsLdOwt5niFP9YBUKwo+0P7XKlLBmU2TxrFyiDxSJyu3bPhafvbUWZPxS66eJsPw8SjI+7LQUAOiM/xrRgZxd0P6lHogGfxyH0ng//BSfNiRBilmR7FSogZ4fCqSdRbiD9cHXsjGb4Jmo4lKT/1XbzkdMTM0ZX2HG2/NuQSA8bWqQSYa071+cdtdj0I8JVOpDvKY2hPZZcSeOwvX6QVd+Z8vstiRTrLJ6TQGDTC70bm23ZQ5PXOWaiJd3SEMRjWCdXKVv8JyZhZaHMtpOohjK+7TpfGmzB6n3WdikRoweRgjTp71vRQGT255aAOSyZh7MRfSoprE+6BqUqCJg25Dyl59/l8892lRo9A30Sn6+FLUT09ubXX70Jw7UKgf3GjPylR606IQtp90TCjQo9lcVUxccZ5TwAwm/EInuX3dtdaTdBuhzw4hMwBe7gRxS/TsIBcsogYEiZTsU1wrOtacxdoqQPoQ8vWJnc4vqpoIaRqjwYOjpngCG5jsr8YzH73GejgS+dnguUibgpqEd6xuxO9baV9piHQUuXPl6z2dfNccnQR4ECwyJoNb2jj+MmHlUfk+d1DvqZV0dikCGIO1EoNCt/KkkkfTNm 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: 50DuI8W8x/MIDL1jasKC3cpYxig0INhE+92FoJ+dW2kaMiZkTC1I2PPGp1RQET0PRYN0CLTQTmLdyzP6oTS9qTqTIksNlFiM9OOydZpeOQCAIcc0KdwYecKp+nK0Fjdtmurk+r8R2VccGgdu4yA8xLafqbIzbNERCzoB1O2KnwhdidWo///+G5qI5b5GZiTf+P8K3lm3hG40UfxpDflSNmpWWOrz2bqNVvAQjrPvJCaMwsR0YD6/uxXahycnCKUgStHqVMEsrZHbcSA2XdLdmPfek20kIrAiNsVKeS1bzrsuQz3cxOFteWJWgBDdQYQlPVb8jji1WnQZ4GBeS0DCEdR0UPuWGGHzP4GnYQRX7sXYeZaPxPIG/5xrq9sT7SvavWISC3YlyrJv8d//wHOz3sii9Abi8ys1sRqDioBe1FJ5aLZF7WJh6oEmBU62cdt0tlfV8iOOOug37vZG2N57e2yGZH6fhVLvF0jEIXTsU+BEe2cqq1Vj8HyvbbrwzOC+BTL9W2tkgfaZEwXicuIElBQiwwDl2oYph1A68jTZxbjPvfU4QWxCMrZ/0sARdfENdKOb8i8g5iKDeKaJEziP1N0bMT91PKvtETYs+1WQ+UNEipsSimMVQA6uApraohZRy9kL/J23R/jlTWgJJbY8cUHwyjFXOqHf2nu4AAFTq+6R7K6vvozCv0Cswwrq1KnQQZNxRd5T3gub+ZScdH3TJ5k/frG6+wsC/TKYumaWIL3pAHrBJmPQxrW68/w2XUySMWfxceVPIiGrj1do9FgEtWodfg8k3PoV3uCYxgBxITvGA/f2ZLWM8TCC3jbZ3rtKAj7qChwm7K3O2a4+eIqm87Nc/171gNEDy1vsYsxA9Tm5WiU7+49PJA4gBdfFwDoKdJJk8uZzRdfw9o3CMlWiNFy/smqwpMxtQAqKwtG9P3sxZyyJ75tJMcg4xsJj4Hy3Xy0mjs1U7E8yfU7b9NGj8lUkgMSlhfoRbt9z0CTVSljuzIbNixt8KEd8t/xEIJAQK+CbjnA8C3qArwdxPo3ZxzWB6xN/ka6KUfHtM3ibarjK5dIjkcJi6Gpm+5vObHtbeyRTwEim6uj3HvD5AaSPOZCrigLImDxivBrP8Q7/avv1xHevx3BhlWbXNSYTo+7799SRe4SlZ/bU1m2JLqxnuoVA0zecdjB2xEEw3DX+b+uxTMAxyJWNzCjkvbY+mToMQyomWoK4Me+4e2L8vYxxpVtSlInXMJbxDw7FF+P/YnMf6NO+nAaZFNm7Y4HqCG5bIxO5p1gGh+reZRXQqJ+MSKx/7ZdB40r53szaz74HBn1CvM/7v7EK08KTU6p1SATaRxAtKLXOAT53+MrcH6or1JjypuhVvOtsBrXZJf8MICOlSr83UhQqUzmXhnfBb/imrVUMOHxVwMRnSKeSb9LSBgbqbuRr/hWhZ1nOxpMH3B8piU2eJqN9VzEL3Zfg8dfEHFiUP49up50rTBfzmCk4ZEzcKU7/L/M75ux6wjkjDJ4mSLOTOBkQNqSG1iMH62koNCqGBTJsbB5tw8rCgfmNkd/ZaL8fF3N/WXiX/5wKG/gQEvGmFxVZRSLKOCmNUMvGKOKRhMDYgXJLxOaVh0sYyg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 995a10ea-e7c7-42e7-11f2-08dd45b4ec0b X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:51.4915 (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: XZf/GtbWl1vCC4MKeDUp9nGIz/u119DywPtuwmKYZlbH48O/aMZe3JViS8dih57lzSaKcUQNTNhyyE9/Gk8P+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17137 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 Wed Feb 5 07:15:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56683 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 3BB60C021A4 for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.128]) by mx.groups.io with SMTP id smtpd.web10.6665.1738739756512032404 for ; Tue, 04 Feb 2025 23:15:58 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=yyIOZMYq; spf=pass (domain: weidmueller.com, ip: 40.107.20.128, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KCmpqCxOf52ND1AuUhAPPk/Dq0vUqzknSAQKSTV1SNBuQjadO+SgxKYGRGsPT8PGQ5k70O3W9OwsGsJnOWQELu3t1idXuXV+AIJqEFUwnv/uxnp/KPxYEPa8fr+uMeTnGHtBT3qtnlhzAZa20iDaV4OweEmOHKcdyIYJPq0a98QOBDn1skfhBCDG8ZHCtXldPDLG/bctD+OSB9SG0tCmBWgHRfdWpbBfu0bkxlCm0srnz9jnDYCNiRCDZYbErvL4y/lmMJhMDfXw7UuNW1NOddYqNzIScYUExJK40XaYR2bpniyAkrHjtXkHHP2GeD65tCgMuqP+Ykrkt4NGnSwZxw== 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=DDTFeucGJZFP3uJbUHjbSCBx9ARlITq2vXiKmuuRtSgOf8B32isJiHp2YI/hEFM48YbOF9Anqhxbhs+E7zDkLUcnt8p3ivCTmoXejwnQ14cUvgJJ/1EyZXjjN7A/Sq061h21qritt+YHkgHRK+wj0xqXmIhc+66uptEO/oObs8l/J46LBs7IBLanSv3TnzEHfpEeX/FJs9nPuLUPqVfM1fIzqiQfIEESkUvr3VbeOPiKV9WuvNI7voKzWI7uktCe2OeumQYyeu+65NZBFnnpYRGaCySRPXnSkzilZS9G0QrnAespqVdx4YUErrCt2wGG5VW1JkxeTctCSyDsJH8WMg== 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=yyIOZMYqLQYfG78UJZbjZE6XayKym919PsNrppeLk7xoMYMx/1XxPdLvxFtPYadlYvbKHFI33AxqtYQh/P8Refmy54+SpCte+/xFAgH/8OzwYdcUcVKtL2zxHxvT61x0vQM1uOPkldH+8WlrYAWAG+2Le/RZSOwx7k6lJAUrWs3Fg/e5BOiJ6/ZonTDYExJbEq96pIf1KroiANf8PKMLDJ7qQbGrMevGr0cGJX2BdYqhdc+bKB9kevwRohY+0fYFi4mWAYbE8ABave8l+RcBtnPP+DbvSuJwze2SRbOm0ZZlyWeh3xFZJye41n9akIjKURdk91psTpQKAdxGTC42Tg== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:52 +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; Wed, 5 Feb 2025 07:15:52 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 05/15] fetch2: clearcase: remove double DL_DIR from localfile Date: Wed, 5 Feb 2025 08:15:28 +0100 Message-ID: <20250205071538.2681-6-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 051adf26-5576-4d83-e7dd-08dd45b4ec51 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: cRhipOA8gCTVxBXvoa8/TqzdZZpEJJ/TPkEnGSim3CMXv92gSEAzbpD4pKIfURHfMaypPXBzbkdG7HK8soq3tFgnmM+wGuLnBCZlGxWWgZfcDdv/sjpTMaznHG6EMJ2+ot4qeKMG9N/+PYF7m21Dfsg7TzPMwxhdImjjPvjwBI10wuCvJaACA7f9NzzyHW6S+631gURixqXQKCAD7PNgVD2NyO3RiOba1TgwDdSlYW/P0tNVnUjPAdHGOjxyJctaJjiC57RwdasN+IkEvVd4p1SfivW0SwITA955HQk5ncPzQLOue5swANYl0oOryvRK0ExpLikgW5aHc0vd3tmmalVGlOJv6dATljP75lmO6n5RorcY1DNr2l0yE1omVVyr69tBxQifI9/4xFjuZktBnF+rgioTGxpeIcjiUQ3GyyfXyNx8rG9TnN8x9YDsZo/HfV/UlDlcd/rtzx7m9s053Ttv4qVMBmb4r4N+iaQBo9xpJLq+RU5n00P+NpLMWh4MAVG7NL/fQTrgJ5miEwdEbbf8Djl9+cbViS1jUt5Q8DUIuJf4uEx3VbvUyHeumPdeGvjmF79G8bzPR8cNI/ZthgAQcOncTLAydqPB9MG2lZ1Zrm3gZpSjdLTUgD9CTseGaHeZYpN1uUhCEMU+4skg0eQxwPc567PcCplsq4DkYKi58l/hQxL9P/kPDXkQIQz+meJ+Izkzc4HHn7F8Xvx/hpxlvGRj8nK63FRWAXjmlHlBYRpQ5oRtiuv36XEdwTacztEKa/IdDGU7Y6eTUU7THR9lXgxayj8ZbotxVUrP45D9ckSvkeIF0c+EO/5X2YmVOUAYpXFPkVpgSoOeKJVq8P3xG/bOc3zPIG/T7euherdzLW7GsLDqlC5AWZGltQEm9JqDwtANcQFgHX2eC0mSI9DQrTzfKLeVE/BwpUDj8q33N/n/yVw/9H8V287Sga5d4rYXxFql6GDfSXaZ6Pt8ZnQtSgTQEVJjtGr7BhbGrlxJI2urqz7JXi5E7nxVfRNVpTQXA2dp9wviZn2HWINvRhCfcWGb9x/WRXkRCcSVTQzZ1USk2fKpL2tWp7aO8L/E6oJv0BcixNp4F4BEpHnziiTCZ5p73/uT6wgQWRclQ4tjWuoyHTEmk3Yjk8TpAOcaHiZFzs+++HPtNp8VbgtgqF9kwpmR15FhRTiAWwe8kuN47MYwpXwuXbbbS3+DlxA8+kLMQIqZvpZ/pcuEHvowFCaXIYRShFTRpB4LRRFV2G+IHm7U9Ot+NgCvuICd+aOfMPtRJYDKrobakh/LJdmpO7TEOFzeSigH+2fXSmx/5HqXNadxhjE+2vhkRwDbhMA7TxASgSh9QM5t4P5OvlHKw7kYoLmcQXlCSCWSa302gF4fiL24avAONq2vYvRn7y41u4ezJqSOCLxVMn0FJWB8jTud9O83QQQtpPamjDMeq2NJaCVzg1TEvqF7tdYWAk76 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: 4zpCpmfLpRIgdHemWbN0j7zQnQdAkloAi/146sb78k9/AsfZSlRT7OnCYJCvlsYLGlBjlFHf8D46DyHR7amCBFmPVLvhwRzehco+9ii/kOHAKLzbGwh/6DlDuzJJ2tdohhYhknTq+eGhROELJwdC9Z8pbbH+/xZAA/RyeRay18ZEryT/URSLpdHLd8YAfY+qz5y6H+9Xv1Vty7zljHGRvqle61Qr2CN0c39A0Vir3jpPrzSCfRn9IjxJqXsmcAfo2mxKWaj71LdxxDDPBnAc168fhTKtwU98fZYvv383Nwr5+TEfnjzLNKkqSo50dg+gFacDVe1Ud214O3SDHvzWbp1mjjay0RViiqwp/xIB1OpjsYt9Gd89LJQrJL8/lBC9kg7R1Bu++xf2fXCqwCle9IuwAWppfCrEDJoL1Ub9LUVViP/wmnh20qK9m0gOEBfUMgTHzbtCNOTjZGxfPS0uxvhOItY20O6GidcJpQkPXsg3cHtRqdRWfIPh61VifGZ+aIukWy7UZlmMJjdN1VcC4FerCweAhqWYCbc9ObL0Oew+3xXosR5PqYELjcwz5B7kGtGlSd+qLeOEVkkDmo7n588mMeXiPAFI4oe/4he626qH5XFbWiq5ZgRvJ1U8ASMhr/X+slhdZk5/3HuebNciXtd7dPw/+x7WuVb5mV0FPjaDty9/rWEauJP1TTgOd9a2tCDPKC+ATnDq49pRjiIIuqBDcyGG7p1sRlH11jCSzWa/bGS7OEiEK4UwpsVQ1mewa0LldVojr5Hr1QQsjhfmOmpcbytNhZp51JhFXsrEOK7+CXK3NWiE8M9RCB6GBxEH4uEb1jplvn3YFbdT/PmvKTolLE8aKJ9lUVh54KZOQuf3PJqDdSaKVWn5Mu0+itlIktwdaY6upjIQ1wXHyoJppX+vGw6X/CJJn+JWIahlxzDb3Y5W5nRThKrko8DkTtkEyUfqW1XbO8JvCo8ESpvmdOmuM8xmQY6aPre51orlldoV9UYC6wGSEHLyAT2as+WOnE7PhWpCuztlaEh9vZnZfSTohoDIEnDyuaDezCT34nOd+8+2wNZU18MtgVmDuLu9IKtNTNmRoFQFh7BZvx3UVyCgrHJDnStNo/smzzRqQiXB7wrSZZsSzIoALVypG2kR0P2+c5+B+tfbE4y2mENwPGdb8CG7nBNLusyaYkisUatcXiiNeC4S1Ilc/bkBgo9MGOs1qjJLVSgn3kK5KUVHRwVysaY9tNaegYl0FyFnDyHjhOf3bpeTcDxMKdeLCmPg7lsxhB03FLSBtPpgQgp7g1dtrNnftcV/MoGzun+SQcJBWkJ1cC7x5VX6zkSk93/hyoyaAUdsu6vM632QxfyTlx1Mz3nhSFIjcnNUAu2XA6Zhe8ER6gxxnQ0Hb/ZcJiZ7gCTEe0x3o33Iyg1vAsrjBx8TGhR57wVy/sIbdbiSdjh5esV+L460Vv+J72NlmT/8QabXZr6cULm/U41qdgHAFgOUAhXOQPZnwiIHkRNzzgkkrPBKM7VRoDvEQjSOPnigEpsZTOkr8aXaD0tj2YMBB7COUaO73FR1+VEU0igx0AvXvsez3fsUDJzAubftk9mLxhIq8QZaRw0/4zKTb7REKQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 051adf26-5576-4d83-e7dd-08dd45b4ec51 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:51.9613 (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: YLi05i6MQ8010NIMAzMiq/QOfUU08xKxrQZkxtI7LwAesUMMr73AfmDtYo3R6LDUOl/UOnCH+IaNcrrusXU4xA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17136 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 Wed Feb 5 07:15:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56675 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 17C02C0219B for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.128]) by mx.groups.io with SMTP id smtpd.web10.6665.1738739756512032404 for ; Tue, 04 Feb 2025 23:15:58 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=IEv62V64; spf=pass (domain: weidmueller.com, ip: 40.107.20.128, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CqKQHfVq+6AUCNbPH36jfQTCdnd1fhpNi6Xx6DFvgq7N+TtVhDG3wymWGBJnPgI9Mt7Tbucrd0SL48lMA0Pymndd0SzJPMqx1Sx1c+eEWq5CUxZtK84BvkXJzPmhAreEqJysFXkO6pIRe3Yed3Lt0WOZgTUTZdzEs5nWGNfNAB3AdySFXkgbHYqPCgyyTdMt2w+ZCyDH89jYgn/41lVptslk9nF1X4VfpHid39r5o/NaTX2mujpn66Je8EpYp8LTHkMq6LDFqnFGT3nT7d+NmhdoPDmlYNfyiJS4GQ35VnkjwTX3tGubnHO6Ee4iwPaa7a7FQzRSZZlSNDTF/3dO+A== 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=hHGAf4v/9lUv8VxKLevKzpCq4/EgJYbnNyC2bDVvC4E=; b=IgtHs9K+ravxLKGG8LNNQ8G4cIv8leHmXbElaDfpBfRHMFtH5ryRJQJ1WKmXas7q1NM/jM8ERmIcyGwzSxfLEX4xPHChcZWtRIHhB85VK0wrW0rhtUVsO0xf70IU9KJuMTrcm0m8U+kl5rDtcoUiORh1X/41xWU7eBLD9O/HEBAKd+TLFFZ30lEucLrlLUJAIB3MUCtMKOlWbpNfl2XgnZFVcr3VpzZRJ7ZM+dlcjNhQFc1IGComcYoZapR6ogHn0tno/FvyOHVt9yU61lVgtyVe6NRky3OJiTW6yVSFUBCI5nyaqc7s/h+r9hQhP71uy+SaEeiGBN7BWwcw+k/9hQ== 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=hHGAf4v/9lUv8VxKLevKzpCq4/EgJYbnNyC2bDVvC4E=; b=IEv62V64OSMx2QNJFGtB3BtfLg2ifRFNLf7UIWyRYlunSN/H3Ibt3JDM8mng/pPce6lZySbvUN0ZAJgvxdFKJ4HDHJH2ZAn5cZkY8l4Y9Qv6dsGF99ThAdpHy0V6cXm8zwO3gl/wTNEugmzsq/XXFsBP7X4yJy92wgoLt0ECV8VtNGJ4RpsxL9uNSWCF9a9wfMU7o0eZ4jErW7jQi30cHAJFXDdvTEAqxWLzArD/RybJhvm1fnHoHLDzFKNWWzT42WVve+B2aLcWNFh4jUBE8ZwzNxAf/h7Nb4B6fxed46nmgZVngncnJEDTPpl5J9lC1KOfSzjdGtwE2JcpI/95nQ== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:52 +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; Wed, 5 Feb 2025 07:15:52 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 06/15] fetch2: remove basepath from FetchData Date: Wed, 5 Feb 2025 08:15:29 +0100 Message-ID: <20250205071538.2681-7-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 02e15bd7-d4f7-4c2d-2162-08dd45b4ec9b 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: cxfVswzmIuYMDlJHFeeTk2P6fGYVq5UXuzRNknRuY1IMJUamIeghAVWeHEgVPd4H2lh0pSTXxHVky5HTUg929ytFVfzWGYUEqHM7vxvDuXywnH6VlvTYTzpdB7aOAqPK9WWTeG6NNwfUtXtc5qF6R8+tI3pFlx+p/cKsK9PwSzVE2B8LjWWl3ogMt/snonjPYiNLuUy/U/iO6nlqU4H9KjQtT6/bTjfESZYUJkJVQSX1rGNzVa/hykaWMoH9gA0BSwaiU35kJW11CJZUZPyXmWR8R3jpJLxdT0xFSHzmntt3AvT8zz9SrRWV9NriFHs1Qd6qlm7O+pb7EdAFWYbbdgrRvtmSRqmT1YFdVQLanr3wYZ2mHcBPMkOupGufpEvPVervT6DLX/M1599JwZalHCOBIUHLjhAyGtin1ZLSX3KZ34hMUWlWrpJKDMQvbcnd3zcXqbd4KpWffgdjrc+a8NeJVb0g9pGlk2zV8xFXOw0meZ+LpMkRE++kRjFbm2+2hc3oxRl4K3vE9kRefxosxWVqKXOmdY6QEGz2Um9je6xy+hDNGekFx+tpx0ldEHSzX2xkpVKqMtglqDXlZdDs7gSEcK4Hp7ZMbpN6wfSSxi6Q2sDs6/cxrpu9uMY8PDaoybVxhar8o23+uAVPfOzHcuVqyHBXMpnqXv8UvJptJPuKrr1SUrPFToISHby/OzI0BF1wODZgBCd/PP4iqnHgvmTlfBGmcADhg2Jq+twZxkyIl7h+vI1Dm4+qcWGvvmhJY0LT9UVeEzM6qfLO3hg7wkyFroDdCI32qNrL4bVGissjHXWcPLGeU6JsD8mJ+pSAVUBs28maT1sygxsEIkMWXj3aK5LCb5/mzLbRF6sThoIrkn7sqnTwxO/Az95cFHElwcMpNcLhrQRokrp/4N5b91z97ZVkIUdo9CslnXkn8Zu2UvgHs5ZHM0BVPLJCEuHSoZ6+16V2ZDrsXktp/gFEAR45gxKUbnvXGOt+TrSdI33Jt09VToG/4jNUvuIybuQJF2icSxP2jA/ZVfNQPcuchIvXeWNmfG3UHEN+mVCA2ElYJKOIG4h1NI3DdBSnJfsSbN60Y2yTnglAp6asNtbhuDJL6Nt5xMLyeEp7Z3PSJm9CjVD575rjE9xmNB7fxp057Wyt2ulf+PQRl6b+0XOvCoI8jBU2WCAQjUhz3eKopl9Xcxrlc8uxGj387AHd02Y/7Ylofw3ocaVkmC99qTCtQ9Ct7hZ3eGmCCoazYW+tsTDNjGKFsEzqIYYJwkb7jjcqkp0OaA2WeObvlx5wkJT/OfuH4KTJ3H7B6CBv1sLqIEf+ifYCPi+LymrCqxRrf5UAtSSpCN3ZLaBnnV4Z64OLtZ8gSdCMvC0zLQFIpRQMmBK0v3k4/ixIgLCZc69ZTgQ2qGkqXO3qpO6Wmm86CRm6y1HjNiAXqLtdPJS2r8AG0bT1FRPsPR+5Y2dGERv1qJm7 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: BnGc3xbQpGiQ3UqL0NecmjyAWdGRZEj74ANp7zCb/ynVdwp/l1u8VaFteKU69BkCdrTOv1A72c0jf3zjqC064+kYQOaaR8r5YdYFLyNh8J6vcr28zBVoDNP9NY/H7EPrJsq6Ox+vgl1a9E0I3EC9FAZbyqLYJwcnaFwd6tNNVYgjpx/wMhMpBSNUAqdJjI3HWN14ALoYhirXDjQIltSeK3HTr1q5qcH2KASmwQF6hnyBcopoMWM8j28yS3c/RMl1d4Dtxm/pgzTwZkpZcpreNTVYzZHx+wmq24VIKW5wk8jz9biZ9s/q4BC3pFzNIruOPErTTbzwxAT0BBgin8XOmCw2Ih/+Xz+EF8+dnF1Yanp3RL3FslfNpn9zhfn7SyomwAkGTrN9YaGr0jDR3XrOJGpbUScVjKPqu2YTHZ9u+Bw8++jCtzvVYIp03wnO8u6M6tf/QqI0UKo92wbpnCI917fF2uw5VzQz9H4OPZysYKx7QAHu8hWdQkbW6INs0w/nG+lj6yfKV7ejrwxUQaZ9qfl9vmMi3eoAmn8Qb6lP5hrLp/21YpwPREXvDDUJ/5cqPTVOcRF2kyrfzvoXCDC2bTVCm0TZO3+BNskAWp+upO+bYYJD7mG5YTkjoGZBL4kLQJ6CUoiW/vk8qSAgf3xxMNucB9HqOZCdGmxqGKpHA0zV5ndTU3cAzSU1E7LD5cuL3kJ0FdL07zVcG4nd35cBbPOJxiYuBzM2WtdP9aZVxV0yQsdpXfbC2m0rfaHUcD1yQbNq226sJCC85ot/R5S/qu2+M81cZQN1B5FYudPUhRk3nwl06SXuUBam/oNWVcKUykDLghvA75rveaVP+xDN5Y31RnknjbBwuMP9HfOAmvZeuArEz8sIV+008cLwn3lNzAOB+k5u+1dk56jle2PeTlUONcn8msulQjdIc3fBGv2He1S/5GX6sMPnliPQ4erozy4qJwYPT3R8Syk5c+vOoTVO3zq6DjxWsquO7tvAf8BspczCCShAZp1/XpUCnlw48GmsVZRpD0igJo1rWMOJ5SS8LVp4dveGhkXfUgJdaNXIQd+m3FzcK1DVbQgFCRXU/3AqvSLz6h6b3SU0nttBYUQ2Eiw7zHe7KafOcrRQIatqya3vzIbCvDciqRSssX/QSiNewOsamheHJikqsRvHJa2MaOSDiV6N77cOFTsbglLR5ZW6r7mPeqa/zKm+TKXEh5+YQ3nk0qfJIylNmri0x4Nw35rQ1MlrDuFpCU+kHwFyS7RUKIAy5UOE+copRfZZbSWU+E4DNHmaTEr0A0NWmv1L2XyZiOYI6pvyp095P25xPVM9F1pe83YaRZPQHyTKpUq4QPUh40y5HyjXWlrmxZWnOfvk9dDn3tmzZocFavdhAaQ11LO/+aFGCfE0Xp30QoZVY5PdJ+IpC+bivWlcDVMOnrmCerbVw8EUF+SZHdSc4S0OU20+/I34vtQmIHUgP0Ro3eAh7o8zOF60GKuvb8MYOgdFgE6SdMmdy6OnubVsg2y1Ru6jZXLKU26jE+eRe4kjGkZX9SJ8zwoVaaxq8F+F398i68jRnAqDost6ULYLA7N9ohLaB8xJwLuYBJS1YPX5Pv/yL0OJaEsGOp1Lcg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02e15bd7-d4f7-4c2d-2162-08dd45b4ec9b X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:52.3918 (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: QO6PlDwdrogqnGM4KtL9LMK2cyjc3m/B0EFGjR7KQrafLA9LjB4K1dKcVAHmDsJVZwPoZ3nAdRBwO8CXxalVCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17138 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 f282ecf17..f4cf25cfd 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1305,7 +1305,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 @@ -1378,8 +1377,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 Wed Feb 5 07:15:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56684 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 2700FC0219F for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.110]) by mx.groups.io with SMTP id smtpd.web11.6855.1738739758488645702 for ; Tue, 04 Feb 2025 23:15:59 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=o2DDDqjH; spf=pass (domain: weidmueller.com, ip: 40.107.20.110, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tZVFIKPl6CqtL2whf3dI4ehTkxuew+RA3CnllrlMPNuz1d/V62aAnuXJ+sLXf9Xl9R1XaV0m0CSkMZXbeUH3K6ZrvTL9wfkMV175lnJXbcSL+zo6iasHu2C0dTa9CO3tlsJ9r/uFe1Qs7yDnzH88EFM6lQUnpdl0xBmNbwRvAfIjMf8eKjuWAt4b8rQ1EOKnngZ2VFbQAnWpXW97B0qssplr0ATSCUAXo0PRVh1rMWFVUuL0XTmL/68rneHGccxGhjxxNUfyFozjsuWNPEw2xIgOuGUJ1IHviwWBC9d3GuHt32d/qASN5ZhX2aaDO+PJnbCZpzhCmSSxs4R90lx+aA== 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=XfgLaK2SL/N0CUgD7/XNkKodIIjE0qHqVsEmyhaxUM4=; b=mDu4/t7nschXLujd0jZbVc55al9b79ujLDFfeTxM9Dqmg4aUgb6Bhk2fnvjOXapOISyyIi9cRnFg7eCfSvZBYp8oZpMDoHg3jfJGQdIV50jhdO2XPhKOJBzdhhao/1j8bE6PHBukficBqmuYIcpH3OjzB87oxnPrGWRAN1lF8h71Nba3MfZF8AVLKo+mnjSa1a/iCepRcjsqjD4sUadFuJIRkgETpJg7KD20UJZw0CZRKsJ4+M0hg7Kl0VGdFROICncQP2SdJyY6fz/6l6SDYCJiV4dijIC+PJTfuuLG7tAIZIQbyiwuMF4/O7sdHbcaXW6jrKHkS+j5ryy0uMMAgw== 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=XfgLaK2SL/N0CUgD7/XNkKodIIjE0qHqVsEmyhaxUM4=; b=o2DDDqjHSjP1hPdfrJtXHARzYYx979kKbDIorE8gC7oURviflk/ILhy3tmHCMgcjmpicRNfmLc0RovFlvbO/yEPWmbWGSns05ZZZ/YleV7JnrmW+kIL/eqNNmA0ApcEnmABDSkNkgHjAccqKb7FRF2ZZfCs/3THCN97Nv6cqaJLpCPoSgvSFc+EpgcIXb7z17LqsbLDe/JY7td/fts5i44EXwL/GXdqBnNl4jG/DhE8qigsMI81drHVjtXCTG6v36PJ9aAXib6MeLrHP+heFdIBIexvhsYyvPGISOpKiQZNhCEK+sngjchuRkb3ik5TPvy0l19qtHT2/0pzbFTK7zg== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:53 +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; Wed, 5 Feb 2025 07:15:53 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 07/15] fetch2: remove basename from FetchData Date: Wed, 5 Feb 2025 08:15:30 +0100 Message-ID: <20250205071538.2681-8-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 369dfb77-d58c-4bc4-415e-08dd45b4ecdb 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: 6JjEg3AWPUPJRJ9AfEAnnGlKL+QG3ZR/+QzpU0V6dTe2ltZoWlJet29cM2Py0FhHon1/1IFSXpBSDNpPRJHuL5IFQPC7EH7TscbAZf8G3u3zjmu7w+y+oHaFRZpDx90cdqfKYZcwtixmbbOHg/0U9W4whAI8Rx+ZWdA4hzfnlEOnwHSvWkGzqYpb7fkZsX3K3xeav02TZYOfqqazdzGZhS27h6/uxVFC2F8wYL/TJSGSSHFUB8ay2Tg13rtGGjTpjuGYYg/8jMZR+iM5B1vdLTjb2N7R6wPUlWhOgUO/1ai1pZj89qIXHO3VPxsPO50LLWDtygP4de0SNq0cpKPp9b56zDKjY7sNLlxuJdJyQjlT3uEWpsVRo/NT+D6p+loj8ZFzuJQ9DnBo4rDfFVKsexir7jBy8EtS4wpvY5Y5pIm6HBrmgO4bsQKvVW0jqKDLHLFYo9HkIllV5ZQ4KL3AdA3VZcoGZl+ESgrOTkTPk6oAKwtcIIWVLE0l5Qiyxzds+CEflah85Nf2xG+IY49ZIcdHyRvr4D1lYPXUW0UpmxaqUbnuLPVNOVV/4JlYxZeGk/m5rfadLgyxFu+6YHQLL1Z2t9f/Spg8y1fIck+xdIgMtbz2aOGnT8J91Kv4t+EcICF8+dCcnO5hYn7GOzQ6Geddqam1CEmQE4VE27xvEqdGEV3CTYd83PiuXQe3UmLuLR/OsQ2Cgvpz5XKskgbgPV9mICyWbUs5/A/9VjsMhh6ei37yLCjYfbw8yQ9foCRaJnJWNPRGWZGBoYh5jgopVPqrPvCtKhi+ps8bsSQTHOS96rQoRRnLsJ4DY/SrC7IznUbY0GB4OYIebVNWXXNphf8boKXzZtCc2dn5wooBO75nmrBYkt1/3OSgIXbRRs6dDgksnGUFX8g5izAWxjSbm44Rvbh+KdLWGfMS5nv2K/qRsT0t46vlp7Gms06C1s3bhqes1Xm5BonCoAU1ppgqs8KVhRaVoeFGMcwxadH/9RkeVbwvsGd3geOFivdv6ipWZSdDzjiRMhoNWGEggMKEXKwM81YTAGkFZJceaG2jaUAh+en5QdpQJbYrvHgyAmvsA18xdDIBUGjaAsghZmvtPcAc+bHKsTpbN9DilHUaLi8tpJE9rOE4tWQkFz+RSA/UAabJJzDS8wEpx1Yx5aLjgQ9BXT7GUJ6d/dTonq0/al07G72iuRBP3ymvfxOffIuBuBndJh/M0sKJ1q+/8LSr349Q9hAeKcNOC5snY6YfV19xGquNBHXX35+twCmz+3FsyourLA+e3Q6/qYy6KqTQIr5bKhFSDa8GDbjRb++C75V8IoUZCjeoxuPX0dysDBcr5IPC3nUSa2Xr12UqDXOCe5p4w9d1vFc69EiF71AxDl0KjABbnUHLTzvm7VzYbEi7nzMEPYyakgAnESYH55y9GsBVoJY8R+RVmmGgWGfRMOX2gYBgIyFWYGRkKnGBcY3g 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: NlMio+iCB8EUe5gkTcmvrdo7IXH/KX/UmGJHmklSZDK6GfXG7CTvJNmzzDNtMLceqMwgZ0aQwhxN7zfEaf/vWL6vn3TUp75Fu9G9kRUAOE34Ox49GEgkmxaEk+BxETZWiXSNgbucrGFpvGkUuKNaN7t1DXN7raC1tncg7zZ4GYgcaXkvZNywO2PXuR2Wr9XDeo4Ki3H7QIt5e3mD/ZiyoCJWPeuouGBJc83mnBtSsLalgp42THUCji87k5dXeURs6eU5gXTFWCvP0NMYM44Yrbmx3yu2z3U4hV5D4aO2cbvn1dDppXQri6knHAql8myGXj2atkBZ8OQ1HII9TuDPooij5jxPA98BPJLrjO/o+a125/x4+xppvgVaTg0vEqvwiMuLS5aBmEkpAXGW//QiPYhWyqYqeKK1tF6MZqKI2ts45mUZY1Jd3kZLDjxCt4W/gX8zN/6DTAdRc5PRmcNKl3Y+rRMvTozISEh7Y3lekifrLWS3wdCLZnYtoxoNhZmwfmXedE6UQNgZJXUL1TAOJ7aUbsucMg1TZUlqqbDJtER3pVD7IpDMumlLghz8kIgQLNcjpgcndG7Vf0pDzvaO2xGKdnFoZCQbUhwTelE1bjvDTEzYq9M1+8u7kee79QH/3FuLjKAvHIPObuZHjTirRtIR0zr+ih2neJPdbFMBEqAUTtx5dANsQa21wcPWYCzXB9GYoN4RPCij+In0RJZKg0hyXSlGur++wZWy0OCtSiF/bCHABpuAfy/j2rLr/sBDsnks1xTDekvRmROALTxBqD2XZX77odh3RVwOHmsDJe3g/I/SAfDFm0rkS9q4fbs9ekkgr7UitlhEB/LSdDbMu/QajuH1UIWxNxZRfMvA3fyJaErH/dGczgUdrIB+Oj4MW8DOPqGjqeOtFYy4VcwC46kwbfXq7ehD40eT4bXGYyqNE9Pr87LKNPFdB1SKCM865xr1XL4TsKMHsL6G9xYYe7A7s3ejS5Ceicc88kdacFHQG+xZSyVEGmqcWiKRVvziv7F8U7xCaODZlY+nvlHOIHCXJLWdIIKRBCSjISImO5kvyugcUiMsSsdbAx9T4VhSdE5Xu6h7KFe1JAmp2CPKkl7BtQCWzXkl2D/rQloR0QsIIV+k84TKvKdJEUWCBUgmVRBjps5aNMxZOQuGSQAfic5XQxBQH0UFZcZ7f9cRx3kW7gT0MagsmdUdelDE5AAnd2XcMt58H4BJdnwI5J1YnREJ3HLv61dtXAsJF3Ki0jiCv610COVGQFVTFaNQ3X3HXttCwGVy6PBORBxhbSVBWq5Pr/SQWTmFRCH5EkAY2vSufQ7SUZJ06M+CQGfCmzvQUxHZR81laeCwYiLXruubBEFYwH6EGWswJqJRTtQS63w+pg2GPBtJdrwFMRsU3xTL/w4DMepxPivI5KKcVkJUYrBnhCTywSTL2D8ka/b8wKK2sgWATuYHkUiRsebl+9KckJ9O1tSHdebjayyFfU0tDQ/0qSnDHhiPsUNMRrw6ZwtThRwunOA6bwJqKdX2lzSmPgROK19SeG7PeZk/4wKfAmAmL4dMbj8RJkKMI5/kAYbF4Xb6awpBvMKmXXt+LDC2R+YbENL5pIrmbpAD6BNJtA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 369dfb77-d58c-4bc4-415e-08dd45b4ecdb X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:52.8006 (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: Hw6ZEQst6pAFMdK5rIJJQinoEOtN5PLYc05XGeHXIMZwIQIr7G4DRXhgEADvrLdTcIMeEN7Nd48FrBdMaab3Xg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17140 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 f4cf25cfd..2328a8fe3 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1304,7 +1304,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 @@ -1360,10 +1359,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) @@ -1377,8 +1383,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 Wed Feb 5 07:15:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56686 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 34D66C021A1 for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.128]) by mx.groups.io with SMTP id smtpd.web10.6665.1738739756512032404 for ; Tue, 04 Feb 2025 23:15:59 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=ZeBFuDed; spf=pass (domain: weidmueller.com, ip: 40.107.20.128, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WL7jZ6wpxth6aRIPc9ji9V+TVi/pEZjzp+kCu1ZG9vSw2iCwoJAj2rvBwTwkDAYuEzt2CmuU6oYutpR9ZqtX52i6p8uMjbraKhjskbErLyexz5SyVLJ9Vs4oV59Xx1uehp4aLxPnl27OIHhmHvtJKPe08W0B0cb4G6NNZYD+B5+PFCg/D5MuC1TAb+tjsO9mcHRZ4znTChsI+LGNcmquSuda0Mw/ea4ZQKaLzEMPqIoZDORg9EgN0/O+48CFHkqNb16zIZq5pqVezuKFIWzGX9XR11+oC2ebBi90HwbICEt2RFY3E1LPL5cM5eCfW2QOtRSiGbKBwhN3qxhOvG7MOA== 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=a8B2avTSXpnBNJDk3dl34xwtVg0AHRL0DSSbZjuGnVlRqLd++igTomGkO4Zk/CAOCcG0DMTbnpAnE/7+rYRPJogfFVENVdPXJM6l2ivqqHP9oORwLddpSqX8/UEUP5OcvAOHs+YI25QVcH5F3tm+PluuhNZLX+botWBP5ObSMCDcokR5fr83AGuYLWbrlwWo+SOaNkePWsVqRNOKxfQEAc7J93AMsWZ1lePWITHbsVfI3dt6rsAUoilK2wnm+V7GMKnLbi6TH4w8EvIb6G13wN03rKrE40yqVF1ht2kDiGX9DVRRIT6rQ5c4/WnIxPuVp1eFxAeck1Hkgbp57J1uXQ== 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=ZeBFuDedKrpKJ8bmkWrM+fsmOtQj8L60ntq/LWSxkYjjfp8V8CVIKPNDvmmRM6rz/6QkXaQbidED6h2pqzWS2jY9527NAspGXv/ano3abz1rMuXdzrO+UldAH4ArtO0V6/Y7vU/ZU+UuPhLgU8Z2SvHDNWHP4WZDsu4RkbhS9MErREg8sfByE1QhZIT0FgwYN+2qXcLAtOVMKxOa3wZeq66SLGF3amR91gCtuSKczAO1AXDsoSiChUDbnM5DtWrCEybm5BQHUFXaTegDZnn6vQpEssstkocBKv8CCbUcy6h+dhDShpxjC46YqkNTUc2jRhlTkXjx1PJDynoh97LfMw== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:53 +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; Wed, 5 Feb 2025 07:15:53 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 08/15] fetch2: use localpath instead of localfile Date: Wed, 5 Feb 2025 08:15:31 +0100 Message-ID: <20250205071538.2681-9-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 93cbca3b-eb18-4ddc-2a08-08dd45b4ed1a 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: /6UZ90eFdSHzEk+MWrCF0OY1CfibY/o2FupTmHleo8+g0d4K9m/qG1A3GmD3FggNJ+d7uejqQfo3xxgtUy+sLzCErJMFcQHSeaAbzNIKpf15xTUUR8HEpQFYb6Nk9NyY6fFSaFMFFe5gA8zxLYlv2ACTDvS2eGqyUv2N9kbGEYKc3ucEbe3LNc0TRURW1RzTKe+A2cKeW3v4kfJK6KJ7bUb7eUJ77uDvSVbphbqJ2k3pLsbORWlsCjq5Zf3S8xcduee05ecBABZHZfW5G4IcTSsnXQ+Zs4PNBR2RPP1PQdYHyP6OCtJHKU7Azp7Pf/UBoZBoRu7Gab7sKfPcgToxlgAku7i3/jGOyQuHEZsJsV5Wi0eK6S+n3+tR7pMEuXj4C9pghStbTxjPi2VObB74Geg3b9afD1lyAulBsHIcUnRna8siuJHEQWTHmCPBEaIIu/ENw51U59m24+s6YBNIXpWmHVloaifh3ShBwsy9Pch59BUERzNmVaatn52E4ahBs5tvxZjb4YDhzsXxsV0xmpqMBBGjk72Ks69gCJiw0Y0Hv4oRF0KbFi5ZIR0+5fAOkEDdM8We5MShWE0vanOs9ClghJeJFLdX5bxvA6XIry86ZSr38qK4lKDwfrwvtV4rdFrSvcErNrXRE9hi7qgSQHLd9HePkThYfuDyDwCR6rbXe+GNV2R1okB4rehiVn7vPf6pvOVN0vlFBwJrFSP97EsUO9wxXtTnacA5g9NGh2bm6HJm5vi0TKLsUeZGDMlSoe1PwZTqs309UsaftpIz7tRF6beBxBvBLtiYrHhY9x4XEgGXgZOf2+3OUq4NgX2Kv0wKQaX2xGg+AwYy3fXnRc6Im7Yg4EYPljWxF42cVdCu4YAyXnG+wSNjZmvIgz6a6StG04SnD6wtxPTA9ooYTe4cbta3pWPNaQ3zLCw/sqsr3IoguJQBIdNo1DFVXPfAGv81flbcLywbg7CjyVHhx2IzDDWauNonXriXKwUPBn7jh/gmgw0iRweoypwWnD9WkqbLS5TGZAF1nMTivVVOZtCHpWZhfruXYk6FZ/u1fl/QneAlCKx96Tdu9BjrHxAMhY8ncQxrd54Wv0uZVmz3wJ/msi7fFU+2xnwjKdlWA49oJOVXXbr+pZN5Ag3nRX0S2CBYcq9hzaKwMvkTjboggGBHZK7TbNEnDTyysGOGE4UT7McaqOuvqLrKP9bEtxAMq0lIkHv5O/N5T4YSCvjgRbMFAZ8SDfspk3FTQK5nxA91t/m0fHFvFlMKVGCpjcsVWwMuYgNVIuW00UM2QtRT8vgXc4W4hA+hZuL76OHezUpYuGRGitvt8f46gkdOLrezhP/8KMUThc6J2McM68lLRszvxSxv3Lawi2VARjngPAdoHhrMgfRx69RU9q1uMDf5AVopdKsQgFgBKjDlIMuK4gmX6QYWkFjvj06uUw0iQ0cNbmEYKSyE2Uf6hLCMIFmj 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: j0vrhLnBIzuAtY9ul1+OXchrUUPXFqoTFMIVWL/ofsTn+by1cZUrKJD13Nv3yfFJijB3+CQjOez8kI0Vbwc3ZZco607kqDrdHwUkDlrwHamUFTx2ujiojmaEds2WEQ7br+hI8nnM5NNoUITeAewa5xRpkJFP7svP9MqbtV65HKavXx8JgHW7X248QjKN7XBscESaOYLmsRYOuJGgFMfc0EJrrXtdUBuIgN5FXa55JzNpJTtT3YM+N6Qko6twhbfqCkq18WJSepVA839AEZV21pfglEzF7Sr6wBLZKtX04d3TxyZkLnqrSsuxuwHjlpCU/0RQYQJsRQlpCKjXaS/76fQgqLIv0T0soJiCjN1LxNEH7WQJ6KDdOmfcTld/ZQaMVet2D85X5SpeZVKIydi5d3MUVPbQSOfb5KVWT7nafXTgubpedCiGGszCPcIwJHsDEPfvWayUXTPfXt6zfbaVdP/NTKmB8SGa7iLOQW9wkVuRKjZPfkn0j48NkOU4TG1v1vG9ahAsCePOZo/RVUkAqqtIl5x3V3VOaKk78nb1tevYpivobgXg8pIBXv0woVZF78vf/CBKbQXwhwmwKqJ6nICj8ccDmjTbPkvnxvhiGuPldo4+qiZ6L//BwqL4zGTzLN635KJHSaekl3qirZnaNdJ4FpTxVfxHF6+W14obFwZoCYZXyUprYyX7GKJWzjtEnZhtbgKjIhXeuUWG3GL7RwkOX1yEHK/0jyZBJtAovbYAsimIjtaDAuCjmUl351nJIJaF7CMINj/HduygXzGiVRx1vIpXJai3rFpqN2Gey8aQ5O7rk4PT5bnM9V6hgGXcW/rJoXutZ8du+fiOi6hB7IGwzXhotLvcQOX3ocfT1lWG/kdjcJpdKCmJrMQ4+NEXVrj3bjm74AGJ5+b5qsBzqR29urAttT/aV1U5mFUjA8Pq+suESynmstv5gfFz7CkdWtfmdcZU15Vd4YIoDWGK/d4bqJmtdM7stv5Df4QDDsfS4+5UZlOzw7iIq5/dgTCADkrMsfBr2YRbQd5WWnbYoPVKIUmPwvI8Bqjj93tq/vPN6xaNPUfi3R17/gGiBn6IzKCR6qzwUYm+RxPhEErLOjoOAle319TLblEFvvEavT1gr6b5UFa2xdVkKpngBGVEdsPSChPmA8VG5Qjinb+lGpltV/uHqnj4dws5Bp+Ro8CuQ7TI2jEdUCke6dLBfv1XBioyV6gRRNZQ9nMCwEsJ0/IIeQ58e9cixY+8R2V1+rCZlnCocUsl/bib3hXULoBltS+08gTKwvMG/0fTyX0aXN4CwjUu5+PatXtlsoi7RkVEBPchS07TbCwbbayt2V20Tl6SiayKgkqIDIb2usZwYFYbzLLGMfULCRcaJNFlgCzMhamUtu5dShSzSz3LheqXFHkhysNeJzq7zHIwXQY77maoAzIfAEtXlQmvwjldU3xRjQ4llyd/CBbu6LQzP7WCPrSBJHsqFH9c3MegQUmmLQPJqqSN/UKHCQd99bT39rZyTPZbfe+4DBClsI2xoRWbZjdm5/sLGKvKrXLVB5MskziFsoiXVZ6USRGVf97HyS4eNIT17VFdLFxuQXmEyhvpUn1srwqYiB1NCKfkbj/VkQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93cbca3b-eb18-4ddc-2a08-08dd45b4ed1a X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:53.2151 (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: DIk13i2FgSdiqYrxjmv6SAWyJOhI/r3AJ9uze7/9z6P46SfTdGhXOGxi+Xv31hhjAp6CJ6jAnllUkytj8W1jkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17141 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) From patchwork Wed Feb 5 07:15:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56674 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 05D5EC02199 for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.128]) by mx.groups.io with SMTP id smtpd.web10.6665.1738739756512032404 for ; Tue, 04 Feb 2025 23:16:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=6dHHm+vo; spf=pass (domain: weidmueller.com, ip: 40.107.20.128, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yW10gDdpQm9cRwPul1vvwCiQPzO5k82Vemxj7AwDffNVpT9PudPiOO58ykw/oMpifQYoKZ9Iej72FeCybYO492XbDL1imU5cIkjnn4uwmlYnB9nzuz6uCDvrq1PU7wcRShNeud076bsF+JQfILTTihuoSrd9VwqmmbBdZTpXRpfBOwK3O85HgtPmRo7FdBM6IjjHPvA+0E+t5mq3meoDSmu8/L8D9HIGB3mmyRtaRyHDqQcxxJ6LoePITUhzGrxKJDv+Z1y3ZbVMbxcM8029dW6M+eJxLhkATS5gkVt5qvNJlTXyjhZSozq6v2JrvTbjhRVBsqCPf/su3Pu0jhXMyQ== 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=Iptm8PjNZ8+AvBc1jWNEqp+lPBwyzs/b4AiM1P3Vwow=; b=hKSslblAycUnKMMP4XYMrhZYmGAg3D8MttZGg+6NM0lNV/jN+6xyUB0VLEzeSnYHgZ06NXt8Xa9UQG/kOrjoxC8lzfGVcLFIdO7ISf3PxxhG7I10rP4cJQw/Th7t6WTeWgkn/6L4A2z2XyLCycpyRvsQ5KVtdx5UpqAbXLrwWIL5vX8C+k0D463nAefUCbT16ExCUJWEzr4/rDDW879wcvgRZfDN0DBYYTYN2gmfaJe1z5QOspoGKO2TE0rF26BoCdH1tXD0FPMfXyx0dvxtwfAG2zWXNhMAU3vwkoOiR+5vhnnMsrTYNk4Vp2MNC7hnhewbfhCm5ns14XURw3rlkw== 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=Iptm8PjNZ8+AvBc1jWNEqp+lPBwyzs/b4AiM1P3Vwow=; b=6dHHm+voG6ZVJbzfVWDmaL/Z2ceQSmU0GCnNNpO9sU7NO6hEjl0QHfLEWEYri0NZsx+p39bete2Vpd2zp7f3c8RlOaPyWZYimRr/tOUm/G5WmjL2U5j8DmAcKJbgfiWHSgTtzoDWaoeghR2IjFdiBSHe2wzzMRr5SV4q3hkrocZJQlbeCjkgLgV9uju9KYtlWt42O/rrv86eGRVbDy4sbbqIZn5XzZA8ZNLGQvHbJ0FI4KfOO6Vl7bAztG/xPhpEXQarpgmqD3kTseakn935KC/FDql9zWDG0dWtHnib/xCa5U7qAqb9h4MMuJPhzDD89n8fbYx43nc+QZjvMJS7Aw== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:53 +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; Wed, 5 Feb 2025 07:15:53 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 09/15] fetch2: make DOWNLOADFILENAME and PATH explicit in mirrors Date: Wed, 5 Feb 2025 08:15:32 +0100 Message-ID: <20250205080953.RFC.9.9dcddffa-7bd7-491b-8d33-ed0d255fa02e@changeid> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: d1d5dbf9-0f7c-449d-86c4-08dd45b4ed5b 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: IlqtDV5SzKrcvEdCZw8SPofm8ktn+0O0H7crE8QNrZWpHKOziNZNdLGNQirTv4tLNz/i2By9Z6ajSmnzpm1tG3Nas4jmkIagaAL5oVNuAUY8dvcMVsAhdpyQkrMSjFIUl+/JEezbqp7PNqwqh68jiaG97mdqkfs7PEjpcAVRk1LMm+ygGClCXCxKhLvILzVr5hBX3KZnfERllH/wON5AxfLUm/r/k/bxA6eEAJHQAus9meJT6uxeMYhMSE9SLHQM057oAcNRxsI8lo2jddlpmK4i9H8PWe+1nLtV8kZkE1zP48GjE5nFzENQPNb/O3OzuSCQ4BNZN9BsD8trJfTI06CXVVjGmvO5UXwqvM1e/7S1QtKp6wRXD8k/v+Uby+f3p5Pfp/iYfCAWjtPBK16uCfndF0Kf5V3vinjv+BbFs1Idq/cbWE/HE7/ajGj1A2NcDlvjJU5MLB31R64iF9tGHNc+/zIwmQtNAFLLPfVg4ka2KQKJbRtk7ThlEGizfs2A9XyeK7Vhk0cGmmefQtPJo8aBP/B1zzK0X15lXQrr7B4DRZk9dNKjL6LXAkh2Q90CBpfslXYBIBEoKXp12afi1aDSaoWT3NIO1DQdOsD66LbX5z1j4vNBHuafkPmgPfpIwZjlU119v1QhRs5GFjyfx7yShHLh5FwChgjB9yAtlUdVetCuZB2NAGuJEXS7yFbDvRjnHq0UmKuJ9RKUx906BQEr7hhQS8UO1YqVLYAoB66oKsoS8NuZ60sNc0E/yGEXiD6iQNQxrZr5NCLCOXVNkma6vVYn0xLxh/9YWLo5nGWj6wcCA885WbGLkHRg6AmWaF0y7fAfQyhPG6Mg0ZXMpdqudPgK3q8crDzpeTXFx958EI7aE9+m0sNLECMXePm/8SihjEJkezpEiyQcSjrm1cm2KA2uNcoTZSu0VOxPMKwrd/bkPOItc9UdFE/kpzrwCLqGUMQ7TjjWpK7NF7qvbP1SRh1MlMdITh//n9HSUIcMM6M7AGiN6fbQlmx1DxT5R+suWyvg1/Wi73ii+tVEABAvjmQegEfXGdozZWsl2AshD/nOrHFgqCiAnCvfcjA7OP1dnlJBKvgm0RCIwr6HVrihLxiwD6DUKpBBSgr24ShtGocFfd7RQGp8RTbkSFx3W5b7ri3czIyI7doty6TTpxXhCOcM7h9TDboXAck6FvWwF7Bnkv18OyTS1yYp5oiQj2iLpquJ4YyqaEwPU4INfnuQnjInFJGEuwwt/fSsfAVg7pYoc2JSs+5CpzemAOiJbwEs9zlxIHOwhEAbda8mmBAadGLaMCq7Wkj40gYcn2JngLrDnwS0O6URuj8oTXUz8jcw0F4J8JtTyfX7Pw7lZkW3EYwRaZClmq2B7fq1WjiW71BqH/1zGGudSMuZMu+0LnRt1MiKQK/Oc191TckO3NqkhBaOtzIlxVKK7LIUYVlm2YZrCqCISNtaFkb2jPow 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: ecoQfuxSvIYwu2pQidqYKPcMEDSANXaXgRtJXNCbyVNxWHvDGIwFJIhl6WNIcMGldTIDJf3fLIuyoaOxDrdbb7cUty8mjIhtSALsydhJ80gHYMj83Thy133cHrEz0tVzXjWPIcWUEGFJ6+8g4P9mXD51APwA3B18aCi0jR3+eFXLBeZb01C8I6SYQl38ZZChIgpbOsgUpmND/rAV13ED6fMLvnzSiAhdQBPSQc6AYL0vIT2xqC6npne5nvtoYtTYkRrk2QZZgPDoD5B3aFoGey3yKifrx2cVHfnW8u0yvSbBaTJBByS6n4qnf9kyyrNVjMPMqzrx8Ivs8SBG8Um1Pp75RQuyKhZj/TiwbbRbgODb2XyeV1SDXGx5EoeJFZx8wwWRfiWTGA8EpCpaYZQ0cvS/9y247DQxzLaChqm508vq/P7/EclR/PT/9cmEyNe91nqweVDeDs2SPs2jo30jlZJuenV0+Aen7TFanUWmVZz2prmrcVO2+cnmISHTU7T7fwHxvWfyUdJKKFF5mRBwI32KRF4TwRCew0x4TfTKe/JJ87oeR2m2zXEfyo+G45/eJ0QZLjBVa3HJCfyoyzMELkp5VdSVHuhNkEOIQ144TTOhRS0P6zCHlI3OKy3eQfgiiJMKeXatLSoIbDySwX8W9d0N/ams/rrY2TESVN1phunuzxs2La0H6NK8dMun0uGWtzvDvfRrt4zOiHCgXc0EuViz5Fv2HjieqnbTz8pS9JLZep+KyLA9rjHwPEXldyeYaf4xMpPEu23qGkm0KgqTjPZdw/RYeNbFYENuI/yP5E4fwfFwZgDcYAibyeZxngJSRBChPrAPWzXYnW3EtS4X8AoUf66iUOQUfnjS5JS7T6j8PL/BcDttOOAh/qJaOdwKTLyDmRe1s4T5E26iHxw/dgW58xrIBhlhRPlv4y4UFTaQ13iMHsirlASvJf2F8IXOGRWAGKstR2IpGTkIuPDRmm6fqCIsV7HzEBp/OHAls+ENKdcilh8SWuKpg1Yfi/GCVOpgn5vaGOL4NZSQ3YHgdyR8+CdoxoI6hVxuOZV/cbPZrgrjop8gQDqdivhWcU8Rrtn0WuOONXQ3g02K3Be1XLUZsFhuYM2pW64czFrKCO/9zOYT/5ERkF40euMtKWG9kIw6KJIbZvmaJVdOpVe3sg4FOWXeiVul5k6Ebw5fZvrZYHws0cWSox+J92jWynyivik/8//0FcPhJQjZEtbKaAKJsyR8cl0RrBPxfYLpAAiSe5ZLddCdoLUQehFswcj+cBbZZ2V2acc5kfuMWBqeoLZdw81UDOzRJyCbElAQPB2XijZZwnQAuwIRXoqVvc0Lh61HciZggjyoAG7K2B67dYoLOnYrD+48haLuBFwDNtNWb3NUufQoL7MDLutUAZwvrpTi9kR53Ng2dLfalb+p1ExwgOV93M+dtDrVm4ri87kgiR2j9ytK3m+O6cqNZ0sFG29etiGr1IgpSpv9HHzc40VcpC9de7YSgAa67bKEo6X8Fk/2NlG8GpSeM5oRmHFJes223MS5tNpeFXZ/AiJWjieRD62w7LQqJADjg3l8Fsz6bn+gj9hg/2iRYT+Z7nyQZAIETft4hiACLztn0zs/tg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1d5dbf9-0f7c-449d-86c4-08dd45b4ed5b X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:53.6507 (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: gSx1ebOStkc4b7OBicfF8ce4U3b/sTyLJZTvI65/Y2vPXHWpL/OX2XFPpiTWPdOLO5rRZ3FE6MdAJ/GoTwyG+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17144 From: Stefan Herbrechtsmeier Make the DOWNLOADFILENAME and PATH replacement explicit in the mirrors to support upstream and download mirrors. An upstream mirror expects the original PATH whereas a download mirror requires the DOWNLOADFILENAME. Don’t replace the last part of the PATH with the basename of the downloaded filename. The downloadfilename parameter may contain subfolders and a mirror may require the original PATH. Add a preprocessing of the mirror replacement to support common inexplicit use cases. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/fetch2/__init__.py | 41 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 2328a8fe3..7ec1b4b20 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -429,6 +429,21 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): uri_decoded = list(decodeurl(ud.url)) uri_find_decoded = list(decodeurl(uri_find)) uri_replace_decoded = list(decodeurl(uri_replace)) + + # Fix mirror lines without PATH, BASENAME or DOWNLOADFILENAME + if (uri_find_decoded[0] == "file" and ".*" in uri_find_decoded[2] + and all({k not in uri_replace_decoded[2] + for k in {"PATH", "BASENAME"}})): + uri_replace_decoded[2] = os.path.join(uri_replace_decoded[2], "PATH") + elif ((uri_replace_decoded[0].startswith("http") + or uri_replace_decoded[0] == "file") + and ((uri_decoded[0] != uri_replace_decoded[0] and mirrortarball) + or ".*" in uri_find_decoded[2]) + and all({k not in uri_replace_decoded[2] + for k in {"PATH", "BASENAME", "DOWNLOADFILENAME"}})): + uri_replace_decoded[2] = os.path.join(uri_replace_decoded[2], + "DOWNLOADFILENAME") + logger.debug2("For url %s comparing %s to %s" % (uri_decoded, uri_find_decoded, uri_replace_decoded)) result_decoded = ['', '', '', '', '', {}] # 0 - type, 1 - host, 2 - path, 3 - user, 4- pswd, 5 - params @@ -441,7 +456,10 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): regexp += "$" if loc == 5: # Handle URL parameters - if i: + if uri_decoded[0] != uri_replace_decoded[0] and mirrortarball: + # Kill parameters, they make no sense for mirror tarballs + result_decoded[5] = {} + elif i: # Any specified URL parameters must match for k in uri_find_decoded[loc]: if uri_decoded[loc][k] != uri_find_decoded[loc][k]: @@ -462,26 +480,6 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): uri_replace_decoded[loc] = uri_replace_decoded[loc].replace(k, replacements[k]) #bb.note("%s %s %s" % (regexp, uri_replace_decoded[loc], uri_decoded[loc])) result_decoded[loc] = re.sub(regexp, uri_replace_decoded[loc], uri_decoded[loc], count=1) - if loc == 2: - # Handle path manipulations - basename = None - if uri_decoded[0] != uri_replace_decoded[0] and mirrortarball: - # If the source and destination url types differ, must be a mirrortarball mapping - basename = os.path.basename(mirrortarball) - # Kill parameters, they make no sense for mirror tarballs - uri_decoded[5] = {} - uri_find_decoded[5] = {} - elif ud.localpath and ud.method.supports_checksum(ud): - basename = os.path.basename(ud.localpath) - if basename: - uri_basename = os.path.basename(uri_decoded[loc]) - # Prefix with a slash as a sentinel in case - # result_decoded[loc] does not contain one. - path = "/" + result_decoded[loc] - if uri_basename and basename != uri_basename and path.endswith("/" + uri_basename): - result_decoded[loc] = path[1:-len(uri_basename)] + basename - elif not path.endswith("/" + basename): - result_decoded[loc] = os.path.join(path[1:], basename) else: return None result = encodeurl(result_decoded) @@ -1000,6 +998,7 @@ def build_mirroruris(origud, mirrors, ld): continue for tarball in tarballs: + replacements["DOWNLOADFILENAME"] = tarball or origud.localfile newuri = uri_replace(ud, find, replace, replacements, ld, tarball) if not newuri or newuri in uris or newuri == origud.url: continue From patchwork Wed Feb 5 07:15:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56676 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 05F65C0219A for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.110]) by mx.groups.io with SMTP id smtpd.web11.6855.1738739758488645702 for ; Tue, 04 Feb 2025 23:16:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=SjcTvKfH; spf=pass (domain: weidmueller.com, ip: 40.107.20.110, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LuJ6oW+dT8NwVfP63gy5ttHaUBSpGQ/G7RpOYw6bzcnv7iivon29znM0+YVrFq8iiORH37h5Gue2Ye2rUBiKiOYWM6gSUh9FT7DoeGpdXC34nuCcuWX+N/UBT7K+YQgXA96rkgA75o4J9TMKgGclCnm8XClg/EaT9568lo1TBeJDosD6jlUHIpvsKNuL/GM+cs6pQ/Yzq/M99NwiIdaT1b4ThYzauDvD/nizfklN/RDs7+xSR5oLcTC3EQzITyl1mAVkE7UGy6GeWt49dQEr0XsUC0MeQEsbtPDglENfDf9qkbflNH01oOSdOOw0U7n9W+tsoaTYwrjT1DfuqHXYeQ== 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=YRoROFcW22BiY5Z5y3K11ndyq/j0i9/mGo/xWVCRMpE=; b=Lub5ubqylFqXULPp6ogDTsrUHTUEfZhX9Lc7Az3MZrLHAJBYtJiX0Yhyohlf6/3PckpGPILs6aH9mt9PegCBcd/Cjskm9Wmeog6+aiMh8jkkXeKbi7K3dTvZenRBBuWlOfbhvZZUGVii776t3Pyy32Q253LH7mJFGvcU/tZtYEsd7YShDXIYoJDKoeN0NmBsFD3YvzC6n3aOOaegwfECIOaiaCEKfQfpMf9p0XaewOian4vqSTr5Y2iD0XyAQKiuaqxnPdkKXQCbz6MrcdBxQDaFk/hDli3rOZqJ1/PSIG9907TCQynI0TluPFJRyjRejap7FubOq2ptuww09NgqCA== 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=YRoROFcW22BiY5Z5y3K11ndyq/j0i9/mGo/xWVCRMpE=; b=SjcTvKfHg3iOzzqs9X6sIQkeRsqqpATfWobtsPrKGuyKNyt8MiHojYDyJ5jK8NmZddhN8Zm+kb8wZqO2J1uhGw+zLMD6LVSeWJduJC+ZmglsOpso2FnXDt98aV4z570jdOobCYpd5CsDaV2Mur0fVJcVq6xXb7VLUy+zjZrKV0tar+GMHiYTX37ScGrSjSfynSqobVyvPebbRk/RVBYuEPeG4j/MBWYwki5daCKBfzlpAmqL0qVW/DBj6SUr+IjGa7l5xhbArO1EKWdFWMOUXyScBugOIwJaRsB0lZXYi3QB8Vt/7DK7tVbChkvDEaLBWHlAozSCrKadDupD9lmFPg== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:54 +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; Wed, 5 Feb 2025 07:15:54 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 10/15] tests: fetch: unify style of replaceuris in MirrorUriTest Date: Wed, 5 Feb 2025 08:15:33 +0100 Message-ID: <20250205071538.2681-10-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: e5630852-8d73-4016-936d-08dd45b4ed9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|13003099007|38350700014; X-Microsoft-Antispam-Message-Info: Y6eG8dAmBLsshbu8cJ8L57U1JTBTueH82xGE+Dck7fmIyNUkDVPmcIJzwEGq85mJlzWTYRcDlm7cg9mVxHlrAwoJ3pzMxVrcYr4wgropfv6Sn1gZGAiriKoGZahAeR4vMKyWZ3e0RVx36eyKhEV4e+durxSS+rkQmIixTPV714tp99PAZKYwEYpwiYNaqE7Z6U20JlrrwFYwCA14kSX5mp3FLRoYD6/KROFwA2BXKGY9urCy+/f1K+XSvneDFh4X2TpZF/Psug0+qOzcBfq3yw0W/SQD5Uz+7FDwASXaa5R7rzQfqVW6ldWqNxc5jFLD0uh8Ty6nrA4mW8/l/xU7dCNqB2bDcusUSW4jUxMqNddI3F4WJO++ppyozxBcWyiYzOFEb5n8m/lRY7WalY6BEJM6AA8NrAI57M2olGAF+16jLjtt91fNEwq0UUOmaFoZ/O+laByj5qgokjQ3qhy5xqK/iCGTgYIiYqaKAPsgZB3Y9s3fxbouP+ME6A1BySoqmkzuVQ8jQ1VuCXTp9netOFp4kW7kjML34zsZfQVAxRQXYaRy85sG212f4TbZLuKHI6BqJEsrnSfZCv5GBZ2fZXaRapOwHalOMTuzfZtA3Qh2ullaPX1wcMt+mtd3sWum78QMi4OrQr2hSIEqHppSvv3Wks+kzvESTyhAGqGvfw9XcR2J9TfCW5X2ydQGV61aXk49iZBjcVk9K4ys0xqU9QmVAeNFdA6bx9G4sBJCDl9NL4e4qyLcWcR0LV5Ji4X7IMLWSaqMA7Tc1mog+tBwscsiVkLGodH1LTRGCqSTZqAODHwT4BNxikVgozx17/cVCDMwp6Fc//3h3xYSTx2GNuMMPQwMUnKPnH8sjPXJ+/bKywOuRC0rgsKVsYLYOMwdBxDauH2cGau1Hp8+2bFz2ciwL9pMRyJkdiYJUgiTU4tRWLp5vHtCRLSanN1XGO2HaOXx20PqvuGQR4pKnzfWEaDkA5reRXTj9qUMVtgrMlWZ8qnLjgShaCS/M5peGbAdG/2Pub2kofxzLGJGSVQR+CYrKy0BVojmLIFb1APBqqLJxZ0/N/M354ezawHmVv99xIS3XQ+sG7XrJknam2zlccxU9iooY0bXWfLwJS3GKVk6MxWGo7REnmm8KaJbs+LOXouBUx2OF6ucZk47eOj1NvlQhfd+21nciMkSjKZ73Y1YuAp8yYmtlD1Py06rUMpKK4V4/Mq1aBYSqyV2VTdconskq8XP3RF3uivZn4olaSk199Lc3dP1CAi7JQwe+BXtMvP44rz0bj8pr+bVZG3vHkKT4dLRyAlB8bhPUORsMSbgd0UlYZJh4KHtclaWySY6pWRF2xLwXl4MOZov+2JDunGJ1PNq+g4bzcika/l5NrgQIJrgMNXCKsBvOH1PJ25k4dqqaDxuQs2ec2gvozZKdg== 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)(13003099007)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J3OH/207XSnQTI2hFV8vXlXmgI/tHo8Y0HkNPeGLK9AuUgJe2xMJg3mIi+k5v1Fk18YFHBdlhPnYbhzA66KUaFkTtO26PrX/VObyul3sWwE20oSdKVmUy1or02WbnvKgmTlbi88TmiCL2AFUSWR50Rbs33PETlgFsQP3IHBFTt6BKxJ74kkNPzj+OgeJxfwzyEtMbS1S3XFgxTydJP/xMoP46BeirDExPFkqX8/r6RU5zxRtWdOrwcCifqbFxC2KqfVaZpknIJA/5ZzqHVbVDDzikhddls/XRZaL1iUnzcZre2cckC5POywIO5ufpO+NtByHObNgVWLaVIC88vaspGo+wJ5PuVBtd3E6XjWCDVNhJ0WJkYxuQ3G+aVY+cseIzMEOR3t9+x93hAeJdVD9wezG1mE027vw24pZ5EEii4SFwrR1mghNwJSM4A2WGbDBkDW/Evsp3RgSkT3Lul1OsvyFPxEgvEYVIuU3DVylqG6ivFO8LYIsW0mglyiLRYmnF8tg2zJ4QKN+ihQtwxxCgJ3jXg+jfhBY5VVFRz7cn/MhA6icyXkLB+UQnLbIpMduhjfFm+P9fgT7uK/Bsyu9QoU2EDFdemezdprBGXthScTbci7XAFG39ykMHeIoMAb4covNDCpKgfr3IyYbPdIo/C+W7n04cQaxQaw+fH2RzQhH5FiFZY+Xi/zbacxAzTUguXVljFnTxpXOPtdc1YjSw2YmSeKoGGZUDlHq6R4Nt270guqy/N9PEP2k2lZ+sZFrr3nTZJJwsiagpHDt7JTZI6BvFIGJkwWPbrO05xQzB8JkB+JX3pngIW3zUkRfkN7nhfJlFt6pHnEc2/Zh7sLT02bYZwqDItLwOPfleUWeT0pDL/0s+FzEYjyIpjwxLZEZv+9O4zM7I6AdgUwXMErx2o49rGz/DDsmIjGidEW3MJaQ5ATQhwTCZ9ecQyqypPDOj+ClIsMo15uxdm2GwN71B8q5Lt4mYOCP2HImkXN+bIjvuYxtOgRuvsc9VYSD5y4A7QqWzrj5BpXZNm578Ln2089PKYnwIdVkgFSudZGBH+7zRJ4vB0Toa1hSzQSmmbrtF+yedNa6bQfZD6TRx+hxi/sOMKCdu6cPbG97x/H/ZEPyBbogKghRxhKuuhq2IpkDu56j9RufJp0B0j/EgQO05vyX57j8X33CzL7NHZndf+vrUOmufvV8ibCEIn7XRiboQ+vtrJdCDoKUvEshmfvAGVG0fMO4par2gozzvp80WwJKpickrZhB8Ym1/G8Q2bRASM2C1pjAcv/oraixYCbi+uSQyhyXCZCn1uVkhBt5dQvLmI67G5G/bq1cLE/SIFaQtZUKzFDutFlOZDX+4Xm0TEwJ6JKIBmt3VC/3tG4UaFMRflTGiPKxHDW3gHOM2FRGok4bno0RUMRQqzu8bMnu3i9KWwRyTYgUbhucq6t84etwusYguQenEYQPPit5q7gpG6FOJ6q3PL4CbwFNLsa0cSP9Y03YMVqyM3N26e2krrv552mezgohcCaOU4yVZuZenArNKgiHAtgT+Qkadl0DVV4jv05FC3r3PJWMMlYHSHzQ7nysgl8kHW8HK9GGrznEA7hPzTEyzZOS8lY77hRJGA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5630852-8d73-4016-936d-08dd45b4ed9c X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:54.0675 (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: ebTNR8qFBdzU1pLu1gdmTE9za8YlOvIWM4TKH3W4hdoNLcN6+/ZC5BY3rQwgyYJnQyeAC/EIthL8Cq/oQrHedA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17145 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index d64717011..dbb787a7d 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -497,15 +497,18 @@ class MirrorUriTest(FetcherTest): : "git://user2@git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http", ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890;protocol=git;branch=master", "git://someserver.org/bitbake", "git://someotherserver.org/bitbake;protocol=https") : "git://someotherserver.org/bitbake;tag=1234567890123456789012345678901234567890;protocol=https;branch=master", - ("gitsm://git.qemu.org/git/seabios.git/;protocol=https;name=roms/seabios;subpath=roms/seabios;bareclone=1;nobranch=1;rev=1234567890123456789012345678901234567890", "gitsm://.*/.*", "http://petalinux.xilinx.com/sswreleases/rel-v${XILINX_VER_MAIN}/downloads") : "http://petalinux.xilinx.com/sswreleases/rel-v%24%7BXILINX_VER_MAIN%7D/downloads/git2_git.qemu.org.git.seabios.git..tar.gz", + ("gitsm://git.qemu.org/git/seabios.git/;protocol=https;name=roms/seabios;subpath=roms/seabios;bareclone=1;nobranch=1;rev=1234567890123456789012345678901234567890", "gitsm://.*/.*", "http://petalinux.xilinx.com/sswreleases/rel-v${XILINX_VER_MAIN}/downloads") + : "http://petalinux.xilinx.com/sswreleases/rel-v%24%7BXILINX_VER_MAIN%7D/downloads/git2_git.qemu.org.git.seabios.git..tar.gz", ("https://somewhere.org/example/1.0.0/example;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/PATH") : "file:///mirror/example/1.0.0/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/some-example-1.0.0.tgz") : "file:///mirror/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", #Renaming files doesn't work - #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz" - #("file://sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", + #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") + # : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz" + #("file://sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") + # : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", } mirrorvar = "http://.*/.* file:///somepath/downloads/ " \ From patchwork Wed Feb 5 07:15:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56678 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 0AF8AC02192 for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.128]) by mx.groups.io with SMTP id smtpd.web10.6665.1738739756512032404 for ; Tue, 04 Feb 2025 23:16:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=j5JQ6lm0; spf=pass (domain: weidmueller.com, ip: 40.107.20.128, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sEMadNVGMX5oArOcnQTFj5JXrJedPZUXijxno4dAQTjHC0jfIgzC9qz1CcLEwpPu4Kw3QwimgCl+Ok8uenDki0r3hn2NXwc1lLPWUSB7ThoU4Nai9zfy3uVBd+fOK7R9hzkId2Y5OHhCi3JXmNq3idAce86vI7sKQgpur57xF2lDOSVBKJOVyJ7X8ymSNpd+55N6VaLxZjrNtQIS9n5027BxPpe1zYb6EAzSEZXoc0nmU/3/AXBot7j8Og7KaI90WbByXLNquiNs048ouo/Tr6u6ONV/mfGbwPwBnVAsKo4VlKkYQv7bJ7PuXRUONKJlSbrcBtqc8G9K3uow0KnCkA== 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=dMLnpLftIO+2gZhPlgcT93HfJ92/IHgGjXO2lKiLiM8=; b=qA5Xgf+H2IAgrQUTPupPgWRWUk6FxFlIrGwFQSa0shXDdfn3tVINiAD/wCn6SSCUItdjmkCiOO/zJYzA49fh/p03PrSqOBbLC0VDhdwRgF7/bYwzl3bHYV/yr93GjzlAE6ATqFtLiL2IWbsLYtIZfLsXsqSiNhDIq2K2Hf+BGZ0hOwm8XIozhJ9JTm7ugSIa2X6kHbq50MmKuRxHq5xCBTb4onPE+dIQhxYXmaQGogTFkCaXBwWz14QBRko19eGbLyQCkqdopmbIgFHQn4ni0/KdS/dFDOdJNgF7TrZoqZyqtqvWh2bs8rE5XFt0gRwEfDYel92jMUlRCsMn8pdnbw== 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=dMLnpLftIO+2gZhPlgcT93HfJ92/IHgGjXO2lKiLiM8=; b=j5JQ6lm0IlW0XRFj5bBpk8fkx8LVeBrkFs2WD3Rj1nTIijQHbHPUlkVY9dxNIAVeJxLm61I79HCMVE/kwlw+uEzyQNijdY9O8WAJntIowEapStwSx/lDAe50Go1yQ/TfohBgD5UZVRrnI6+YdnAa+nHxNI8ofruHF3Jj0Ayaxovfg745CIyusLUjD3E6cMGqYi81H/D7eJpB+50yE+YmndUcN1m4ml5t6lbpPOpj+YLEPW2FsGKsBRJ7dMJ9pXuUzNhHCaBQJi9cjHwwAiNCZtWLR9QNwWu5bYbEjoJhz7iam7SmJC1a2Vl2Dtq12KitgKjx5REhU3fqFG0gPupKLQ== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:54 +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; Wed, 5 Feb 2025 07:15:54 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 11/15] tests: fetch: fix nonsensical replaceuris in MirrorUriTest Date: Wed, 5 Feb 2025 08:15:34 +0100 Message-ID: <20250205071538.2681-11-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c809c06-a64b-4a5b-f178-08dd45b4eddc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|13003099007|38350700014; X-Microsoft-Antispam-Message-Info: y8PNgP/Z8W4htelEEBGLmhvLCLlCM7DQJYld4TFDcSnH4oT0dvsZiKniM7TqtF31081Y+fYDBRvPgf7CEWZv/Eb6fJ3G+UjEfe2n+UkYH5MW/OgzFOFqlZy1vB66BYoHP8gSUq7cjD/C5KnWB91PoHlBmtA6o/J31g/CmW0+bTU1AlnLu3xD4gXCsnsf5qI9SwHYFluoOe7cCmYPRahm1o7wxfjeZnEXjdIiO/KQbd77dlLoF03HnWe22mFR5P9t0WYrwJ1UT0ZctqivUnYKq4BIzDE9jBVla+K6fzjMTNzb4j5TS5mAr3Es/GL5IUZJOWT3yMUd2LcD/R0JAvh0J7TxCHUdblZUFNhMWAs7WatNig0r2VR01w7HRNJQDo8V3qq/JL0NMvusglPPM66+X1jmCQ6Y7HyCzQODhtFwUfjqaAEna85FKzPJNTtCNKLJPcNNc2L4f2A7NkuhI2IRE69QXByjnU5wTpNUk6tfSVnXEH7ZoN6q+pwh5m1qGuQnz++kMp+5mWGsmxZY17ZcqRyYRd6ey6sKoAUHRnH3XODuSHeZrr0qpJbar/I7AU6HTT/i2jB0985F8n7Fl2q4suUe9rbiAaCIbzSiTACeSvJkYcWlaeXvEdxRrOhUf3RBIRCTrMxcJhWEujSJ2/zeWO+q5HC1g491kPEsiwnt+eJgo7WPa67oPhHQR7hcs9qSCj+nOfOSF2eBu4+6f9j1V6NA6K5JyzIY24mE2HWLxyG23zmkXHoVUFLIsrp2KJfQSA4HCxrt0XaZz1/cdj23RXKuAQCq5T62hLuqyl9p6FQV1n7ySM1pRzEq8yBKxAmMSHGSAA+hq3Js0St+wI0ZtkmdJd5Bjwdp3rlDXYSHnTzReNc5YJuoODGBkhCUN0q11AZdGXnGA/1pZVfEufoC5aIjF5re/XI/o7VaYzTYWO0elZl80YsmfTs8rcLOyFwmM+2UsYheuhmmnBiImS3lybrbf9TTxIoSr2EwBlf/hAzDeXGT3ujQ5LZbILJq57ux0Uk1ReVALBJEIW8VPCRQyO8NXVBlmsSm9oDkdfTujXrMkcSmfu3XzANPBQ/HsEBsyKVFr01X+s7/86F4MAlyfxOoXFJA6CrbEliir/lH5yorBdSgPcJ0Mjwh2+CmuRzBty6jvlEWPdXLfEQIoCl7hKfdQfhLCbsCY30bsmTzUnVPEQwt+7mPVSrtpDHj9w9XnL2abrvPNzpXso4XxA4vKerZL+VJgxH5RCKfrowt05rRaSG9ON4TwOVzMFxCdoXNeJ7R7RggiNuCt+V5DtL54AcCBVwLOTqGrAf4HssCTeyXzEDPJ/JTfQeOmSIJbyRRj27aW9NDzHCFvD2ifWT+KHdfokV+dSJ8zdGF76UzvqhgJ6kiQvVe5TZ/Jp0Sr2l4l5eXXVDRh/o6huWTFsa6Yw== 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)(13003099007)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W1bsYL2IgzbLj5CahDOhlWI6po89EOGXQYT1849HBT+7W9Ez+T4r3r6dQ6FRwJwK2lTivTpd8L0G0RQSyy+b29Cw4KjKXwjkp7Zxh71XQt1++15K3JZuwTMNOtlXb1PxTNJXupK6WliuV3JxCcSYg+uVHuoxz2SZb8/Ghj3eq7bILKn8OStwm9HuEA//1xa/IAJ9qdiJXejRM7okrF+vGLxLokWfC5yauZypX8ZG8Fi3C+b1K5u2XMDR8u66pn6fHOEa61oOJkAeDA7N1rWhb3rI7ZoIkTOegml6CK98rLfewu0DQArzNGAlHYs26F7QluJahRBp1XBffskwGwPFz0aJoYCGxhVPZEos8Mr1SQ2YkhNiBoFu13q6qB0zgxqIHjrnWdPNtcr/OkkmEZwT8T3SVVa7msN6r9uyTWHb9zciQZsQlDvaAPkoQXG5i7OagqQEhj4owTRqLppjmbpQsSG/kpw8LU3OiXm5x3IHEU4qeMm6Ugq5Kw8eJD2glsw8+Q0Hx/L+hGqL8yOlWqAKOxS9LYEzNIkl1/gYF1U/MAxctU+rJdJ4hJovQqgxt4dhKtsBjblTk2kmTur5s+0d+1RTW7Jx6I3M7L6JImYGx0phHPnEqmkVc6Hba+IR2ayqFY62h/4Qdw+gwM/q0fde63X+1RRMrmgZZWt7HxeqzzkmuGkOlKlJ+xWGYlzslrkaMj9VhBZ+jX8TmAqIxgSJo2GLkfszLlZE5z5NptcwckIMgcRwnuU00vYpxwTl0xn+r68uMpHD9LTNLjzYSpPkDEekEx8OzEshqYHxaXnmSPnpXaCQVy19fOhQIZqVBFT+edtMIH/NpvecEFkYXURy+fLD9LSlxoXb7fMpqxNSslhBA2w9G2UZYJ8MVI1MWjezYGz1oOWoyTTkhNLGggfG4A2VkNS9jjwpqsoyNPf7GkqiaAtR/vVPbHJjEUjvKbw9sAJENSh4/IFC5ZTmgiTi/YUPpf25kUqfbG9acT+J2xK4/ktWYdfeW2sHig3qlSFsHBgJLKDF9gwHbX1p4/hOWxi0legYEAJDFrWCSJ7tTDB4h5Q0fcd2nVSbebf+hurFUQPkv25QNvaQelPNwDj1iQBOy77moq6oBe/WNiEbKmxW6bqxd1zpH9P3HMkmmNDzQ6gNYIa77Dsmkv1PwEKPgP6a1y1BFvxuQmZ5GEgxByXfWEmS29nZ4fgVttDUBQSMpwQuxBUuwnc7KTomRNcVydRCvvoScs+HptyCGiNE0xMdEyJFBO8Q5fVlzrb3vTpcT82vw/RZwRvdNZEt5/A0dZN3E4mkIPoqZrDkAMTzmnOGlj9AC3Hv3RG1PwIHCdiHHPDCB3lb6xMFkEFx/JIrRA0iM7KBP2w3UFtH5vaCKZD++OAfU0HP1jhlJloUuZC+WkPqWfQmf2553MeYi+fl12J9G5MTCsNigGfVgdR82yhKOVvUvlqCvKyqkXIc3Vh3FfpD52FJzPIl6yuylWxgXKqcBz6CNH54CNbFVInGYfdcHfWUaXajvZiqfw6QQPzZoJ4UM576Z2avp7xZiJJ5UADNeMiBOKUlg9XvWwiOMjFvTQXIN08p9l/s9B9du3ocruP0WgNu6ZQ0mOzMUXoBLA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c809c06-a64b-4a5b-f178-08dd45b4eddc X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:54.4829 (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: 0ROU6CFEqJpxFLGej71LthngSQ88bz7TXlfOHYLqnOKcLoFmhZsYs5BSItl8YOU7FcQCsOQo5vMKeUEcpgAbGg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17146 From: Stefan Herbrechtsmeier A replacement inside a mirror URI with a PATH replacement should retain the original path and shouldn't consider the downloadfilename parameter. A replacement inside a mirror URI of any path should retain the downloadfilename and shouldn't contain a single file. A replacement inside a mirror URI for a folder requires a folder in the tested URI. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index dbb787a7d..ec6d1c039 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -500,15 +500,15 @@ class MirrorUriTest(FetcherTest): ("gitsm://git.qemu.org/git/seabios.git/;protocol=https;name=roms/seabios;subpath=roms/seabios;bareclone=1;nobranch=1;rev=1234567890123456789012345678901234567890", "gitsm://.*/.*", "http://petalinux.xilinx.com/sswreleases/rel-v${XILINX_VER_MAIN}/downloads") : "http://petalinux.xilinx.com/sswreleases/rel-v%24%7BXILINX_VER_MAIN%7D/downloads/git2_git.qemu.org.git.seabios.git..tar.gz", ("https://somewhere.org/example/1.0.0/example;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/PATH") - : "file:///mirror/example/1.0.0/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", - ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/some-example-1.0.0.tgz") + : "file:///mirror/example/1.0.0/example;downloadfilename=some-example-1.0.0.tgz", + ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/") : "file:///mirror/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", #Renaming files doesn't work #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") # : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz" - #("file://sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") - # : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", + #("file://somedir/sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") + # : "file:///somewhere/1234/sstate-cache/somedir/sstate-xyz.tgz", } mirrorvar = "http://.*/.* file:///somepath/downloads/ " \ From patchwork Wed Feb 5 07:15:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56679 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 186D8C0219D for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.110]) by mx.groups.io with SMTP id smtpd.web11.6855.1738739758488645702 for ; Tue, 04 Feb 2025 23:16:01 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=2H2MXV9B; spf=pass (domain: weidmueller.com, ip: 40.107.20.110, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WFCafhkIAE1++5QCHcgf0eyolESd/nL0iBGOEI3ddw5uRkI3Otz9wY+GOsXYa07Yx4aKUgRKtbxaLwMcviamPGJ67uYSy0d3SdaGiCaJQs1RyAQKuy835jskTnJu9ZalDoy72P38VUM3aEHw7N6KNlbk6KrJHb6tMhb+e7Sk4LSONYJf/iCtsMEqpeVXBjmdQP3wVS9LTPE6F0o65jhO9KyupvlkwaMgWkwlBlv1sW+SWWytFEI82Ea7t7PCJ5P9m+Ypry35ZGZ0gJQ8ZQaaDd62UafuEx051jJUX5eovbdVMxX+vOHHjiKqhLtJFyaNTlej4HrkB2TIXJOnHLxKyg== 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=912l7Q5D1EcysHSd0POI4SV+7ga8EjJRHn8ktNW/sRU=; b=MFaUWCjtU26KQ5o5JgNuCO+MXKAmer4ws5TkS2i7rn8GbLkQySMd/l2wsOyzza5DiTM6icImcJ174fo8pd9/BsaDv0UeCaOxe9c4PeL1pTkg2vuGXIIRLlfSZ2oOQ7YL2QPBCrpF+AIFP5+QXHPnoFPKF47lWQDRP17g6Q7U4YgDkmGHmw2WZDkDFnhy8XH8OluE3wzQUOf0TYuGtjxhZw28pVqQUfjqWcFoybNnvUftJMCdIgf9bighRKsjT0dwiOgWM+yx7DKSe2VuK814ACAVNpyyIIRvnhTUIZ8F9Hkvl5JQGG/UmI79Aqp7zwtARPjtDUCY8s/grjMm+JIJzA== 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=912l7Q5D1EcysHSd0POI4SV+7ga8EjJRHn8ktNW/sRU=; b=2H2MXV9BnZN4/alU45vqy26mI+BJLHaIDdybUFc7MDfdSZ13KnRe/VQCXkIUgsbUTC8t3WK5IjW69cwH/UBHww4xC32aJkqudJAagjhvlgGpwpxM8Xq5mzXow5WlUf9wgYfllsymle1UgfJkjdZLiMT1La1hOPmAs3YRcauQoMUAywhcDqqRESOgyuacdq6T/r1RiHnBvAgKppUVt8NC1wNldMLM20lCX8D64mM5YF02vOdrGm6qAqOVji+FY2dGeaJfpbyBb5VxzGBlDEfYOvsTUnG6SgzSpxxg2b5vAfsvcPlLT8g/MEQPUzhg9kM27yuCc0XmIDJlr5UNIQv5bA== 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 PAXPR08MB7320.eurprd08.prod.outlook.com (2603:10a6:102:223::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Wed, 5 Feb 2025 07:15:55 +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; Wed, 5 Feb 2025 07:15:55 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 12/15] tests: fetch: reenable replaceuris in MirrorUriTest Date: Wed, 5 Feb 2025 08:15:35 +0100 Message-ID: <20250205071538.2681-12-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|PAXPR08MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 89050bbc-4cf0-40d2-8382-08dd45b4ee1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|13003099007|38350700014; X-Microsoft-Antispam-Message-Info: g4vcxf91KVl6xpwwCCqfH5xGcUIRZrySyHg3orI9R37loZ5XdI9x1iw7HqV087zUqDD/EKNFK7NbRseqO3I0NBxGRRRvgsiyZxAF+8mtTwYDZcQd2MESXNtfWMBUb/TvnRlBIdP1ne8k1hwfnadW1YjXg7iHpN1BHVFtrshJ4L8w4Htyvc9NmgtJfYHpJe20ZNy4tWY7+6vn6W8Lep3TI2//Kvez1EbCy0cwiJDALUjp5ZSdLM9n2N4jnvJSMhS1zjmJcyJTH++E1TbXwArppmtAc/B90QB3GRNi1FsddpOCkwnBAp97lyJHwW5MG5y2WBkOno9CumO2xaG7nJTHFIbp4BHyaEhHVy3me921fB5kcVsVH5zoMJbkuGQEKJiFVtgF0rXLjPo85CAw7k/RVU+X2wrMWj/aeuID5/CrSABk/CyRm59TD+ggKIfkmMuiiGDbuNiSkWIstBbZjSWkoOuiPRmLepFFvXSwXM/tJWrNdAPIwq8GXZxYKZ/+qcP0NG2ABo3M7gZyRpum6gNjwBxz9T9q6p/Js5JMFdUV/6Vb2vVBOpZQ964bbdR7nfBea0RFwsokw5kcVvlkPHrZ753soWPV3II+N33/Ei1Y3Wij6nEyEYBnh2DCRQwcPSa+IPDsDX0XMXyMEOvn+IJezCcpofIITMNdNp8d9aZvwkdEil4w1ChdrHqm9AV7U6Bylw1Dkps2ERwkepco8PuIPY1vjCNO0hf5zBUs+4gYNZx2wka0iEnaI7fbRsXyk6Nus/N7N59uQUtQxtkxdlNpk6XTVcyOhHi5WQPmgIhy8eQePpaN0mco4lFbuJzShJ4F/9aik6cNK7v8kYs4kaZ8z5oA8tS9fy928djOQaeDIQB4/IvyCMcVb7oE0iX1pExGN0wnL2GYkvAy1aXpQCZCCNYGrCs7zDHFOqf/C2sqksEzaW0up2O3luimA+Z+2QoBYrnaKdySKH5WZhxt5h43zspAWOEIF/W/d/eJIvO/0DmNEFki4Lb+WDZyK+qoPZSrCuiSegHcDYbjSuR5IAILS7Csn7NMPdE9H4jBYCL0K1gba8wNAMOECTy9FB/FOtnRu9Hm/k+wJPDrsAAck87rFedljAMxSAT5ITCPySI9EDdfCjKNYlvG0Ss4wEomU4YzU5yzcOYJHVsMP5dBfPDfhJCw8Ufy8eszJebaCL62tPKngKLeHtTh1/dWGqe04Dl8GSekIjOQi7RBZ56N74Lt/jOuyALxY+Ttgl+1QF9xzkSoJ+yFLNVwOHNtIVojZrXqu1DM0nduRn/+t2bdvbWAWZtPG3kXn2QQP83HVI7XI7as7cfjxl2NbI9TOH9skAQxByziQwDz492Xwck5s3dsL0LmP1r3hj46eVh/eIxzgy2Ng1CtBNn0vt7hQ2dgCKtK 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)(13003099007)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZzmVBB7R82Vt4l7uRvIPnrfA7uD/48KWtM8ezXIjZdi58t3PPRGxKKj7fJmKMrQk3DvOFHy+KRqQFWFMrRppQemmkF9T8HoS2B2UCE0MWy3eluYih/eSPuyUyErvq6FKyAS/JM/flYIss0+2dvk9RZjYI43UjUPWtL3uSgu/O/xM3Wo7FIfmsXg43iSA3iLIh1rPJXqhJq9h/XYCoyejEcQr+j1TD8fAbikJqzIXWEA0Yrg5GXTkyoaU0NPAMtZUJKDNclkWD+r7QftoCsleYGySv6DUXhME8qX9Rb8/eSYIC5yLQOdWhfkDua55Y/PUbKlQ2HROT03hAnY09qSCYhAAo3cmURzekN+qQQoDxuffuPHtkxeWjid1gp7P/WeRRmSIdyUMXeQ+ncd1rrtoax+7B0P+RoodvScKz+zrrstyu/eAqUMLIrslJ1b8LyRUtn+dzSaz+TGaFTRcG609HJQcEZA6eC57ML4XJDohaTm+p0JLZN9+yGuDqyibw6Gc080SiMNHuEJHlZncw2B38ipt5kJnCsJKS2qOoQQ136CWNmiRrCDfm2grrUdMWucBSgLpBxMbXLHWfNDWrG5trfKpJg136ngQn0jUkTzWcBTkopUQnmGAG9IsbKwuislfPWoeCWs/kn6Vb1vPFF4iRV5dJctA/wHk3HBJ41Ee2C3dBBkMTpcLXtv6MVQs/1yT30QGCy+M9N8+1IhuqGQIKg65TGo/6FaAGVz0n5CPwJI+c89XNgyO4VCQODbHyRZ620F9RjqHANn+ieoKqlXjbJVQaJziZho2ojcMlkrWYE7NM7XVr4LVhLnqhrS1ptjD0NISugkHB8tlTLIyRtlAhKoAlTqRXHwY0OY1hDE8iVdaySI6Oj2m0HFY3WTtCrhG6ItWGO68R3LJYHnWFaVy8oVVHl5G3mxaTIjAfJ5wDNQkXFUh2q2rnxOezwcoUUBr3QnkQJp04jiwct00Q9+JMYWI8Kvu752oKRTvN7GKVWzlxXram17dBVJ0By9+Bn+ibQDtbj09AKkbIqGCUytJzGV0k4QgeXaAkP6WNr1rrkdqp5Chgo5rBdIreZrlvmRmwHEbUm6akz9a9KUkK8CkkmkADhiZm4Ne8Y3ku/5fgU1SjZdKVWvWXlDkK2iX/IA8TkGOENo8KQfjaiIKw87FLrwGhKWigNFVPcKww98wM4dPLjfSyN0Qgq06jnTBWy5sEYMnOJK1JJu9Gtscg0ZxBNFZyhOIwN3w6CT7+wi+Exe5kcAJ8oA/PG/6lJ6RwdnWkGku4lASRpxWzsxVZO5IKgFJFDvI4n3gS0eRiDqwgDQ3s8a7crVcIZVCwo45k2IkeRc7js4jkq1XpOrxH6y0mVVP/KPw6vkJDk1VAxthjx28aIslWiMYN8x4lkD525dD2sPIRk4R7v3YnEg7DssfIaJw2cV13sqGDjszyg14Rb5p71HY/1MQzoiuN6WEFhNFO9VXineqE+EhUoCDgLISymJFbgKMc8eZcoM4oMuoMQwcrueF1ZcNpN9wxDApa4fspyQsi5zZc/2Ynbh9ja+GUnUeTm5hdO5Qoh875/+tHKTFshnWuYoR69xOd7TNEuCbdijQ0Y5600kXyoVbUMQmpQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89050bbc-4cf0-40d2-8382-08dd45b4ee1b X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:54.8895 (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: vH0TulUW9k/3WZWySqjgGzYhEy4Fd+G8e/KhV5XBXo6Z+qkf4g9WDCR/qZXTVyTV9VJcee2bG1E7+p288+JFsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7320 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17147 From: Stefan Herbrechtsmeier A replacement inside a mirror URI should support the rename of the PATH. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index ec6d1c039..29920bd9c 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -473,6 +473,8 @@ class MirrorUriTest(FetcherTest): : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache/") : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", + ("file://somedir/sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") + : "file:///somewhere/1234/sstate-cache/somedir/sstate-xyz.tgz", ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/somedir3") : "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz", ("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz") @@ -491,6 +493,8 @@ class MirrorUriTest(FetcherTest): : "http://somewhere2.org/somefile_1.2.3.tar.gz", ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/") : "http://somewhere2.org/somefile_1.2.3.tar.gz", + ("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") + : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz", ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master", "git://someserver.org/bitbake;branch=master", "git://git.openembedded.org/bitbake;protocol=http") : "git://git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http", ("git://user1@someserver.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master", "git://someserver.org/bitbake;branch=master", "git://user2@git.openembedded.org/bitbake;protocol=http") @@ -503,12 +507,6 @@ class MirrorUriTest(FetcherTest): : "file:///mirror/example/1.0.0/example;downloadfilename=some-example-1.0.0.tgz", ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/") : "file:///mirror/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", - - #Renaming files doesn't work - #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") - # : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz" - #("file://somedir/sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") - # : "file:///somewhere/1234/sstate-cache/somedir/sstate-xyz.tgz", } mirrorvar = "http://.*/.* file:///somepath/downloads/ " \ From patchwork Wed Feb 5 07:15:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56680 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 18B99C0219E for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.65.84]) by mx.groups.io with SMTP id smtpd.web10.6666.1738739758879250353 for ; Tue, 04 Feb 2025 23:15:59 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=V/tXJxyW; spf=pass (domain: weidmueller.com, ip: 52.101.65.84, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QnVvQ74JkI3rzQZcDsv/akcvTAmapXsjJYZjQUp8+wUFmxdg84LyWd0VyPvN1mM+sE6QS+cEXj8aSl3I6ZHhFoeS+O9/8AZtJXa5zPauxjrbV+KrbmarzjtQZceYwou1BT63RTfl5sOz5TfEcJQG5wusbWkyrS0LA3xhtqnoVjsqfI0tNMnPEg2mrAR1rW0s9hAs135AN9oFZM3MHxf+PLZQpK9ekYH+g3uV8FKv8lfLscTnJuIJhRK4e7qMUE+Le21ManbNOc7OtfFBR5AfZVa/1vRkPTcN11Nr7PC4e1Hnmw4wdvuuxNTDGhZrKu5bfXqydlMSWogpzMUxR+vFrg== 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=7cUZdyhde/Un1gzAnkn6OsIK2MnB8ctyVaYxHXwUNzc=; b=y4XcUYAMJ6O7XnFo3JPZx2WLSLhkvxxredRZrxKW9gN5zkYS02vtDmG7nYB9yeTqWbBWuLEKWwbuRv2J3UBD0LRo5k/UPOUteTsBQGEsJz1IwOx+sbJcpP2jVrn/4LecDIumx23jK5ykkFDnarr9X/Mn1BVYxfBOoUfAG7F9DLvtXv1UrjXXzNq6uFGoNlfMyw+tsEwsqzYvh/lMSphdRQqo2SLdcRL7AkPbCxQsfvlMtXlCSJjPsrvDFb12l+vHeIeWAh0r8JhENOKIQxpjWn750nVtGJKElJs+fXWeaZlTzinHwUgJSotd/43gZo/AJTPpYXdzCHSHHua2a8HR5g== 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=7cUZdyhde/Un1gzAnkn6OsIK2MnB8ctyVaYxHXwUNzc=; b=V/tXJxyW630tx/5mU3VA/kd6uqSnQlTIAriR1SfIC7C5h8Y+8CYFnJCXzFItYxl7xBQ4mBKgJ740bB5r2lYV4cUQkIMOmgmZv4qUhgJD410skca8Q6NLgdByii68XznbT6Nv67SgPIhpihXt2/3JcupscwbJf/8G2faBLiUKkaTYrzCcw6djyBl3433S5WiGai0MpDYhzR+evhP/TeVXGShJzH/XtKRcA0Q7C07btC7r9IcaQcVmuo0nMXE+VUTakI0IH7xnz8j4Pp6U/OI0UHHnUseeTWxH6Xm6s7iDvEqMqbJDFL1H5+A6IDBKfOqdtBLnEoyYPmdvWVt7KbRFbg== 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 GV1PR08MB8743.eurprd08.prod.outlook.com (2603:10a6:150:87::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.23; Wed, 5 Feb 2025 07:15:55 +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; Wed, 5 Feb 2025 07:15:55 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 13/15] tests: fetch: comment and add replaceuris in MirrorUriTest Date: Wed, 5 Feb 2025 08:15:36 +0100 Message-ID: <20250205071538.2681-13-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|GV1PR08MB8743:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a4eab19-e2a6-4f3c-e8cb-08dd45b4ee59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|13003099007|38350700014; X-Microsoft-Antispam-Message-Info: Z4Ly6BeB7NW532ksOyc9pAFrrZl7O9WGGHFFsT7A4lGkDNZyWSM5sJLta5BNY7MXBkUWnH/jvoSZzjvfy3pHVOPmiUZCBrF6E9KGUM5VbiIuwjczCaT6/ttQGIj/1iFYKp8HHh6U9mfDn1ffd4+FamWsGNLNZo19vgZYBMwpTXtIqhjOJDpOrua//uz5YqKfy427TJ97Yf48i/s5x73nrwung9xpY4Vd294ag1HWH2jkrZMKbJQjdLBWKyP9M5raUzLSyD/WEZEM3tCyqQV+SEtvfoIVKQT/7mBuDroBdnPji5qqV0GUBos09co/1/A+WpQAif93vQlanCABhqnVmlexUmu1D7tx2AOWAo4uhMJqubwYh94y2X18p6B2tnAdQrjdg1J8nRTvnOoBW4lyZ3p3wodyTj2cw/HASvHMUlzYY1HMYPOlBslQjx6K//nxGhqbk9/Ihcu7+85er6BPNovSo1Zn3h5dgHpl+xpK2kCt0jrZG4AohC26U09tY30Q2jdz7I46EberZ85xwoEHp29Fe2Ylkvc6PyggMxAIBhEyWAet0ZwPqQt2K76+o9rUANGSa0er4RfX2UfjtP1XhOi31EVgiJPKffM7JG7ZCYh1EgWY4uH+uBrEakW6mV7kzqFF+uQ/Z7a/i30luHOMzyFWuOBgCCLg7Jtj4J2psCrJo0zcj3pwvHQEuvCy24ci/2LqoMBBAO327fDSU/L3EB34OGyS+lZn/Vovpmkus8k4a5OpWDxk0btLN1rVRPHMVipmm/ey+7T3cCzPQrRH4epXeSJgpSXZGbRcS8LhJus3QlEosMwqB+ye8HGLDTLGvo3v/m8jTlt3GNJLqig0mMYmYIdugy+OtX46lHgig0xlHR7GTqXdTQiP5ECpzQNlpO/YCaSEmLhP9XBXQCaeC24Z8LwiLKf3NLQZaW7R1YdEtT64bKcwpJcZVsbmE3XrwnjhCV8P7iJNUzM3MFLMS1aHRDBWBE1Nb2Y20kSmmQ2W8eju+QZeZv8sMbTMRIXTg5sXsOYn/KiZMaUZGW/BmJHh9CUr9TT9WbkY+xj/oCrQDZ8PscHF3W/RMZb66yRj2d143BtqWSwjO4IDs8x7pCE4cykfSYRmsViGy8N8UvXKob+lgXbZ1ywMn5VF24m0GwvAoy5mnm7EhlNu5tFgDzQRZXL5dFE1lVAmXomS5/yPa2hrJdHLbUNVDjnwSBJvK1/2EtycQMDYsHDyKbpkxHb8s66ye6J8UMrEaKF8n4AHh3TF45MUuMV33Duarhsny4eCSueJgSTppzyFoSxW/arLpS4L2FvaB9ieQu/ZPd3Vmvl9ImMOH0ccbRiG6VhXUPPOhXZ2afeOxzfaUBh7GQUTvAo4JPymJiv6wiRxib3dXZzs9kYTVHIv5Uxk/RV3 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)(1800799024)(52116014)(376014)(366016)(13003099007)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5+TTD3EXGPlJ83ZfvphSZN4rsT3ZGMKR812iMucehmVemsJ9OYQTqWxOjQZ6RDDrbQrAk72Ws+2lfP+T06JHsyN1nG6VvCV+Qyc8bUFt7mQPKPgW8cctXDMDlby4s+yDpQgyHeaYDr5hi4/necTaEjySWgZtDhQ6NdKeLK/81X6V2IlSRvRzT/hOXtA4Ecb4XwI6LA2nuoMqXikL/j9eaxgM5iTUqGoL4TasAs7T3TEobKMMZSGXzJHQbB6cc42IeJEw31TPNc6oNGK58JLb1VFotZWDMnP00WCAjAsxwG/gsq/1kC6WPRZ2urXufl/xY1vCDj2s1yGhWvcbOdbftIbpftk6boYfMBuqz7pBSY8r6c19JaMw9kxmDRpfo6Gqf322XMwLMiIlyHqkt7Gk1UOI23x8khVqrMVMwUZbCZpGYhMazCPTWgZ/AsTXD5+2XhPNU59lXaUzmavDRltYHYQYq6vKE6/ndkjoE8lpEBuVgpxNkEjSYNbzDuIEY7nlwiJOIY3DPUIboB6Ezkpzd2vgAb+dsXSTWepaNV1O0xkRNUHGinEsPpuuop/krvZVme/g56ZJe4TYEV0w76b0wG9NOf2QJA/fpqMdAXqjgk34Yyqu9aA3PI1nwjrC8e9+VFIcMoR5Cm/7fBZGvqtascJYlZRb6g2wWVHAQEcNmtFO3NhFBxFkm+YHZQ7hRAXHpBblAcqaMH2AcBGnE0ERFy5judDwA8wdfQa0++WDIJpmofMA4z5xzqReJs4F2g0OrmDcLdnc3PCnpVuHswGyhzDx0rITeQBI7JPV/s7Egbfy4zb6Jwlmf3Gsm8I6VUDsFA9G6Uk4g5scz0vN775GWw1CzmVe1KkZlvfCADOF02VT+AhQsL7FrsH86c4t3Gq4kV0KU/Q8wYAq5r+POR+o6kJ3GwE9FOpY89UKhNyBYOTDEKe6aRK5u8dsJTTvu1biM2qPAk+OB82sgqfi4LNfJ9QU2TJNLY8hAWeaGIaRtOABLRAI4dJ5g4yzA672uh8K1VQrJfnjwH0tHEFGyL9eHfveNgtdwayvq8Mc1COj8+1lNvrMACSRUfjaoN9zx7CtzQOkcLax0x706BDFohGtRXtMAf5WBMnyf/Q2dhMx0N//U7XX6nYm40FCg1w6SD7ANAOFcVRcF49ms3QjaNm10W6ABlZqW+gEDrhDLmCC9QXwKMI/QMKwhZznHGFRd13TdntkbbEh5govJdxDGvNIioMH/JnH6fhe0K0JFiKGvdJj351oM6BRZvvqJOXF3hZfN1DJ2elNPWfj70q41OhR+U9ConQWgQBJRbLKvKyW6cn/jxcdKnqObyuLwD1D9W9uxvlNe2l+udMwyQ6WN9n6fieYIXqQsyif/kND8xzpZTlFT9NCm6Fsy63jWWERpBOexcMhWIhXRttH7RPFfsYCj6BT8e8RO7/oPhGCr+EWn5U69GeuP8raJ2lcr1K+GgyxjPVVUZZ/Jx3/559IF4KaDpHExaadtd5/LVeRcMG5v7fj9joMxlIyQ0ZXFgpvna+nfo4EBV9EkteaKMW0W+7l7wJju4O+pcxfoFV8dhU9pJWhoVVfIydr2G6zlUQvXzpZz1CvGUD5L3T/Fxsn5Rq2AQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a4eab19-e2a6-4f3c-e8cb-08dd45b4ee59 X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:55.3444 (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: 0i3ktlVcboLPy/63MUIv1pADPMKPOa1qt+fGk0bnWeGnuCRRGfKCjGRxLjfttaIajeNFw/YPL/UxR9S8n0KYgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB8743 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17139 From: Stefan Herbrechtsmeier Comment the replaceuris in MirrorUriTest accordingly the test cases. Add additional tests: * Explicit PATH and DOWNLOADFILENAME replacement * Rename of server and path * Rename of downloaded filename * Subfolder in downloadfilename parameter Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 29920bd9c..37de4d3e8 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -459,8 +459,12 @@ class FetcherTest(unittest.TestCase): class MirrorUriTest(FetcherTest): replaceuris = { + # remote download mirror for git ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "http://somewhere.org/somedir/") : "http://somewhere.org/somedir/git2_git.invalid.infradead.org.mtd-utils.git.tar.gz", + ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "http://somewhere.org/somedir/DOWNLOADFILENAME") + : "http://somewhere.org/somedir/git2_git.invalid.infradead.org.mtd-utils.git.tar.gz", + # remote git upstream mirror ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/([^/]+/)*([^/]*)", "git://somewhere.org/somedir/\\2;protocol=http") : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/([^/]+/)*([^/]*)", "git://somewhere.org/somedir/\\2;protocol=http") @@ -469,44 +473,77 @@ class MirrorUriTest(FetcherTest): : "git://somewhere.org/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890", "git://someserver.org/bitbake", "git://git.openembedded.org/bitbake") : "git://git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890", + # local state mirror for file ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache") : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache/") : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", + ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache/PATH") + : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz", ("file://somedir/sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") : "file:///somewhere/1234/sstate-cache/somedir/sstate-xyz.tgz", + ("file://somedir/sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache/PATH") + : "file:///somewhere/1234/sstate-cache/somedir/sstate-xyz.tgz", + # remote download mirror for http ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/somedir3") : "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz", + ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/somedir3/DOWNLOADFILENAME") + : "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz", + # remote upstream mirror for http with rename of server and path expect basename ("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz") : "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz", + # remote upstream mirror for http with rename of server and path inclusive basename + ("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile4_1.2.3.tar.gz") + : "http://somewhere2.org/somedir3/somefile4_1.2.3.tar.gz", + # remote upstream mirror ("http://www.apache.org/dist/subversion/subversion-1.7.1.tar.bz2", "http://www.apache.org/dist", "http://archive.apache.org/dist") : "http://archive.apache.org/dist/subversion/subversion-1.7.1.tar.bz2", + # local download mirror for http ("http://www.apache.org/dist/subversion/subversion-1.7.1.tar.bz2", "http://.*/.*", "file:///somepath/downloads/") : "file:///somepath/downloads/subversion-1.7.1.tar.bz2", + ("http://www.apache.org/dist/subversion/subversion-1.7.1.tar.bz2", "http://.*/.*", "file:///somepath/downloads/DOWNLOADFILENAME") + : "file:///somepath/downloads/subversion-1.7.1.tar.bz2", + # remote upstream mirror for git with BASENAME ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/BASENAME;protocol=http") : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/BASENAME;protocol=http") : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", + # remote upstream mirror for git with MIRRORNAME ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/MIRRORNAME;protocol=http") : "git://somewhere.org/somedir/git.invalid.infradead.org.foo.mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", + # remote download mirror for http ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org") : "http://somewhere2.org/somefile_1.2.3.tar.gz", ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/") : "http://somewhere2.org/somefile_1.2.3.tar.gz", + ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/DOWNLOADFILENAME") + : "http://somewhere2.org/somefile_1.2.3.tar.gz", + # remote upstream mirror with rename of server and path inclusive basename ("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz", + # remote upstream mirror for git with other protocol ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master", "git://someserver.org/bitbake;branch=master", "git://git.openembedded.org/bitbake;protocol=http") : "git://git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http", ("git://user1@someserver.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master", "git://someserver.org/bitbake;branch=master", "git://user2@git.openembedded.org/bitbake;protocol=http") : "git://user2@git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http", ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890;protocol=git;branch=master", "git://someserver.org/bitbake", "git://someotherserver.org/bitbake;protocol=https") : "git://someotherserver.org/bitbake;tag=1234567890123456789012345678901234567890;protocol=https;branch=master", + # remote download mirror for gitsm ("gitsm://git.qemu.org/git/seabios.git/;protocol=https;name=roms/seabios;subpath=roms/seabios;bareclone=1;nobranch=1;rev=1234567890123456789012345678901234567890", "gitsm://.*/.*", "http://petalinux.xilinx.com/sswreleases/rel-v${XILINX_VER_MAIN}/downloads") : "http://petalinux.xilinx.com/sswreleases/rel-v%24%7BXILINX_VER_MAIN%7D/downloads/git2_git.qemu.org.git.seabios.git..tar.gz", + ("gitsm://git.qemu.org/git/seabios.git/;protocol=https;name=roms/seabios;subpath=roms/seabios;bareclone=1;nobranch=1;rev=1234567890123456789012345678901234567890", "gitsm://.*/.*", "http://petalinux.xilinx.com/sswreleases/rel-v${XILINX_VER_MAIN}/downloads/DOWNLOADFILENAME") + : "http://petalinux.xilinx.com/sswreleases/rel-v%24%7BXILINX_VER_MAIN%7D/downloads/git2_git.qemu.org.git.seabios.git..tar.gz", + # local download mirror for https ("https://somewhere.org/example/1.0.0/example;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/PATH") : "file:///mirror/example/1.0.0/example;downloadfilename=some-example-1.0.0.tgz", ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/") : "file:///mirror/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", + # local mirror for https with rename of download filename + ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/DOWNLOADFILENAME") + : "file:///mirror/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", + # local mirror for https with subfolder in downloadfilename + ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=subdir/some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/sub") + : "file:///mirror/sub/subdir/some-example-1.0.0.tgz;downloadfilename=subdir/some-example-1.0.0.tgz", } mirrorvar = "http://.*/.* file:///somepath/downloads/ " \ From patchwork Wed Feb 5 07:15:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56682 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 2CCDAC0219C for ; Wed, 5 Feb 2025 07:16:06 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.65.84]) by mx.groups.io with SMTP id smtpd.web10.6666.1738739758879250353 for ; Tue, 04 Feb 2025 23:16:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=prRd5xh9; spf=pass (domain: weidmueller.com, ip: 52.101.65.84, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yrXi4iQis5pz6X63t61dIdU77RLQvPCOqce7OeHjEOWwqjZTGsSzSLr3AYCcnop0CfseFJACZz5gFdZPMOTpcuxSFinBFmD9Qrc4GE/VrSWZXn1DWO3R1UgCUQ9Ozd6Ezh8XfaYqpSSMjP51anucotECRRfqaZF9fKYnaoCwK58AcyNKUrI8mzicR9BRPLRvntAo0Hg3I5Oy5bURbkDzy5Mmn8OjB2ozKTcsdo5pmm/ANef+FlA5aFtgx6DarDfWdP7WogGrjInI6fCtAOKYY5hALu/l+MgBFnTU1+j/1ZAlZD8esE7dVypI4QaWGGotDAkKe4HgmS7Sj4VqWYWB9w== 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=xeRYyJtWoEB3vM4TX813nIEG4bnGpvfwP7a7MyHSQcs=; b=BfMSRsjlYTz22QmjXR/LOHD4xaRrVszQiDg7XA4QpD8HyekdTCx0mhqddTHc4UJmpLOCyAeicRzJeb6b703yBITMAk6WVRDHYKXzj9rwyKjRUpLUmW9CvWmNYIauS2l97Utxafj2tADZKSJWor+FqswbMnn/uvwEcbxw60gmI7KCAWpAxip2m1sZSxWkrqQ6GFRve3hrujU6IHtJg0TADZQ+R2K8o1ZqmP2y9PmfWgqU77jHnt3V9a+/41bRXaJSAawLUYg8R9WFoBKd/j0jq6sApkBpSMnunKKqxaGaysF+0kEXn/b9AGG/XLtv2pOlFz/vNIlVitddE5mqnx8I3A== 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=xeRYyJtWoEB3vM4TX813nIEG4bnGpvfwP7a7MyHSQcs=; b=prRd5xh9U765g/EvEs9As/IBwiiyZ2J9zJuz+8xCwnc4eG3b6j8mV85A8TBsPxQ8QhmY/fx744VE5psFImST5A+7GeTi6sWQ6gSdQNiRArJib7nw5fXf1ke32awgTz1BBRuDkuBkWcXxUmyy3qYPjtkxsah/Zz90nWQj/o1/cnAEIqsFhhnMLylOGH9AWvkaGI/ZAAYGtuPGfa62UISrIztcAjqQyuEHeJRBXvCP9TAenF304ymDpCm5FFjoMlqIfqYBAA6oCb+WxNsHZxLKHGXwhIdLtK9ZKNduqc+D7ZnGtjSLGPsI/yUCjUyU4c1B7dCU1v0PSzQcdtlTNJvcWg== 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 GV1PR08MB8743.eurprd08.prod.outlook.com (2603:10a6:150:87::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.23; Wed, 5 Feb 2025 07:15:56 +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; Wed, 5 Feb 2025 07:15:56 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 14/15] tests: fetch: add npm mirrors replaceuris in MirrorUriTest Date: Wed, 5 Feb 2025 08:15:37 +0100 Message-ID: <20250205071538.2681-14-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|GV1PR08MB8743:EE_ X-MS-Office365-Filtering-Correlation-Id: 2595850e-c559-4d17-15dc-08dd45b4ee9f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|13003099007|38350700014; X-Microsoft-Antispam-Message-Info: mVCTiXYKV3v8gQZE6EMAcSeC/VUTaSMSWZ9A4xT4ROfmrGjTQQ3Zy24CX+EPVinIvDHCtLoEwQrY30/xYM+N+jANcjkbgmkXTIZleyNy2ipO0Ki0bcPcbrycVTVrArzrwrMyYRtj3+mAya3FEPLYw2g6b+FuxMDZQMYM/rseJymvOzoKdJ+sJDQhJ8eYJ2kEvNqHtooRCVFuR1HMC6p64+qXRYYbaNTd6jnUIygf+lGTyCStrrfbfruThxqO3/UFuJSJqiDXFPDkf32eH/gpr0RRG+9KcrJPFzYc+j/Sx0BDhMxgyFn4JB/naFuKFWTRBoXvD87YpN6spsO6o1kczWyzKR6RykRCVNZ7ZTmomHHi/ql+RqJOAmQzTBkPuEoDcV2TTjBvvxlbbfleLBh6d5gmvBKGWSYBPmksKdKXzx5Ia0UIoERtvpJRqMPvH8SJ04fPNP2kkTwHfjfZEKqL+m7pdK5Sq+LHB7OqSQyv84REprVffZsqc3FYfqr/8J1I52aJRn/j7e+pqVhYpfSvsqjDYU0T/vhA7y8f98bzPdHUCPsHE1Ri06kGVZh+tyBiPmgu0ERhFiKqxBTKORB92do2WwleqaTjmikyiCigg6kQuXCniu4W044Y/RuXG2aMHI4+rarh8pULSYY3i/ekgfbWt8nqbqOVfzMbuY9KNywz6XiJ4OsLqNN0xUelm9CXJ1UmvdLb75OpNe08y2yifTJJKFXjikEciYr285m9cgHAKP4Nieoa4E4z3ktKJeBTTF2FU1ym4mXMFGj9lT0O62AaKfpAGo9cpwxoZptOsTHLjNDqDWln8ZieLXEgY11XF6+d73/S0tBb5/kgqWLDLkqhuqQOsHzdnvaaDq0cxTV4qqnfqCNES4pvS+Xuy6O4NFbCSi7fpPwcaSpYQjgcd2JtYQE1eyXExjUCaDHlAlleNWdzTaEsUArddc2NKxDUao/ypyjKre/ldT6f4f3A3vjz+kgZcFe1OptUPRJBrdGVQEJ1LMuvekuqO8I9r6XWv5zly++Kh2j5s+QzNHhpJzEKSf/mgJfUT52kaW89rNvwW2cY0le9NRHpPTuB8anbg7M2Y+E1Ila1bjXVKPV/suW/noWTz9Z2CNOdK7BU8LAAs5dMy8kyxYpnltaYF+D0BeSYw1lRGxwldtE0HMymMLa88o0UpV7y1O+F3yydi8K1DkSnDVxxFLGi9Wiv4/w4B1arAct2xKyINxtuU98J3or23lXf245JaMkyoJETmYxOlDBbohNxKfPIR+vIeWdDiLci4SCMNmLc2OA/Xikji4CuDb5NXt3S+vACPYeMANsDrn2o8w5wvxwNv0W0dK8TqQoOaoW8H7XFp3AD1FThOkk445nzu0FkQawTWWAh9xuCDmuq0vBRbAE9Y/Iyn+y0 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)(1800799024)(52116014)(376014)(366016)(13003099007)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ReqH4Bpno1Uaoqh7iVUMQiBYMCA6hzyzkA/jMTBq6QfaynqF1F7P+TvIYHPT88f/ss41/5jSC+OEuVDuFnnyH7JdF8DWRGCQqAzeopUlf+j6kOugU8T8ECMd450AfZlBU2npJbRS17Rnr3MT9kNN7hHUpsZ5eN09VccNXmmkKODFtgLjnksn+a27fewKlhnkRDHpZQWLKE//XM8wA0cfmcA49JNLWGWMjDvx8Mz3/Ox5YHsaWwg51yI1UQLuvC6f3+NZZuLhPc+ujqi0meSyPTZr8qqj0YvEgCpYXa2a/THe/Fn++fym+r5fUWE+jnTyhYffnJnI+7VdkiLPVBmI1I7Nik2vuSLLUjh6Q6F8Oq68ygBU9LfvUWmAP4Uyy/KqmOTCoNa7meXwd6m+QibFjUs8w4Ba9TXAh19nJ1RPx1bKng7IxOtJBWeH5RcAej+It4f+3gxSwCf7wBV6stdT32FcPovFL1JFDMh/ZfrdzEHtbPDVFxCepOPvwBDnjUCp9vN4ozxmBg7QomABGh1bOYfg5bpud1h/45gOl7C2iufRavAooiBfC9J0c0jS1NkxepehDVpdQqtC7UI6NLlf8rmEvtzGLFML09vZYMQoSu1b18qOB2JY96cnl0TMk73vZHzCCrXs7PGCpgn1wF3mF+vn4gpSsJeBCQmYL0w7+ORMg/L31bYByA2cT8IRJGfd1PTafjj0OW7b5qhIegsUgtr+FUuddBRjubDkeRHVM7rIyVcOfI1E8OgJnfYl7o66/jJufmJUj7+uOneupkGHpxkh5NSeuX7K/7QAm517DPMIh5nZeBz5FaaF8PC32c14935NDRZ8Gp5moj1LIEgQGHmobBDs/hIdxCPJv2IKM2egTWT8TgR3+DWMSLl2nxlE9TiBHZEK9e1MvwRkfBBgVactV/n48J3peA10KoTmjTbWjQuN07/9pnoIJs4m8OXwU0o3Pu6b9kcSeM6GmhebOejNoDWMmf+swGDoi/bnceM1Ayc4k5RRVKNNpEkGoBYVtDnpxGLL0CYkeUBEAS1yguMDkbhS6QdRynLdm4CdpJ6mcM0cmgqyQV9Dj8Lx/evSo5zxF2jQApge88Sar7NaQtJZANSwp22R2ZORjZ6LmZU5TujBgjtl/BPtKsTTV016WaWSD1A/SznlN+yb+FgpYwcftgrNDWoaTYkx4J+5uSu8kNqC3pcpJFuBZRyRRebRUKyHVQT+IDeU3miuO8BKVulHZzbKw3HY1IpqmgIzdKHZs+A3aSx7WcCKcFhW9bz283F+N7po8qyep5n/KqZK4Yi8U+ZaCQYqUVTXk9S2qj4c+M4DmBWOTSblDvLcvm+RS1L4ncR5lLeIj4eQ8HMBF/wbRMi8hRgJwQ7ecK6y3rIKuKenCiYcxQUt8aA6uswdDphKClE0PCgcnYj3/KWiVkhlOzdJy7eWAjP3lYtxOyLWhTo1omIam/jwrHr4aKbwCRsFpxdxv/EFRdjxo7tBZXQxS7Mb3f5l2rM9JwXiAyX4iiwgmb8KQ7wWrmwlLfjFIIb+trJ//HZtMnIhJzzAt2ZyCaZ2dzsDG43zuTVbtMzEbNtzK0yu65U5m1+jyIEWf+lls/q2U4lL5qKMgBa0hw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2595850e-c559-4d17-15dc-08dd45b4ee9f X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:55.7683 (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: kiEAiU4RGrQRNxWGIRHo/pcMBE5/VBw7XAiqf2Y1/6vqrFvGtTpwSJ/3QBC0AMI2kTvbgg1vcrV/cN+LVSSh/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB8743 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 ; Wed, 05 Feb 2025 07:16:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17143 From: Stefan Herbrechtsmeier Add replaceuris in MirrorUriTest for a npm upstream and download mirror. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 37de4d3e8..5d247f6a9 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -544,6 +544,12 @@ class MirrorUriTest(FetcherTest): # local mirror for https with subfolder in downloadfilename ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=subdir/some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/sub") : "file:///mirror/sub/subdir/some-example-1.0.0.tgz;downloadfilename=subdir/some-example-1.0.0.tgz", + # NPM Upstream Mirror + ("https://registry.npmjs.org/@node-rs/bcrypt/-/bcrypt-1.10.4.tgz;downloadfilename=npm2/@node-rs-bcrypt-1.10.4.tgz", "https://registry.npmjs.org/", "https://example.com/npm/") + : "https://example.com/npm/%40node-rs/bcrypt/-/bcrypt-1.10.4.tgz;downloadfilename=npm2/@node-rs-bcrypt-1.10.4.tgz", + # NPM Download Mirror + ("https://registry.npmjs.org/@node-rs/bcrypt/-/bcrypt-1.10.4.tgz;downloadfilename=npm2/@node-rs-bcrypt-1.10.4.tgz", "https://registry.npmjs.org/.*", "file:///downloads/DOWNLOADFILENAME") + : "file:///downloads/npm2/%40node-rs-bcrypt-1.10.4.tgz;downloadfilename=npm2/@node-rs-bcrypt-1.10.4.tgz", } mirrorvar = "http://.*/.* file:///somepath/downloads/ " \ From patchwork Wed Feb 5 07:15:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 56677 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 EB048C3DA4A for ; Wed, 5 Feb 2025 07:16:05 +0000 (UTC) Received: from DB3PR0202CU003.outbound.protection.outlook.com (DB3PR0202CU003.outbound.protection.outlook.com [52.101.65.84]) by mx.groups.io with SMTP id smtpd.web10.6666.1738739758879250353 for ; Tue, 04 Feb 2025 23:16:02 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@weidmueller.com header.s=selector2 header.b=nJwYIujQ; spf=pass (domain: weidmueller.com, ip: 52.101.65.84, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BJJXoZHhC9PmTkKsE+IbDg3m8T1cErbQrK1Pv/6BVeln95p+JOnG/WGu8qdXnvLKodnFoKq7vRSbscSDdFcIgVoA/clrRmms45/819y8ssOfptnhgXWdjTfhnSG7Wu7sIkBAcKCo1RfSY8Nla/7H/BgHtbknmlM0c82G2wmNeLWwYw2MzivfKnOnmnqZvEea5pUtykGdR05DupIZ6puGx0Y5nzlrRZ2QukJ8hJylIa6PhkWaSkPu4p44zQv/gm5lqpksZfBaIa6fMVipkbLXlXHO3in7zqFAQpn975zOPorBEdkqIRD1dLSPPZZbxvinQqdDdLsWb5MFeVlda41O+w== 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=BlUNHn9hzsnaJX+iokBGyeLZuN66VGzvl0JgS8J2vNo=; b=okJeQq51CVutLeqAaGGdzmjzTSF/cgB64bJNLU7u6hKl3gPmUjCqYeEBoBSw3BcQ7Q5u4X04Ox0oiMz3qkuqg8YLpqYipR+Ln65XF+UBXrP38+tyJ8dY1KIIMJOaYoq3Xy8n4ySeWBUntRv9X8QEFGeX4zbmitX71xFph1uc1iKFLMA1SVyqZUTCDb6VL2G6sOk7/iQMEwMtW1kt96L6UTS9XI9JbmQGqPMv9Mpi1HBbdqJlABb3jOdZWorY/skJPE2ooaCjBZFNF4yX0V5CsqVDFvBdRngVH9/Hu7ySP3J3zvI51anGxbSTy0/mVCfE3SRdUgubFmWO5GARIoQNcw== 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=BlUNHn9hzsnaJX+iokBGyeLZuN66VGzvl0JgS8J2vNo=; b=nJwYIujQWtPS52Ktoadf9we119tPB5eiej4qMPYD/HOX/GJEBoWaNeQmS0VKCyrLBvFo2LC1xmQS/4uP8/Ci5tjzp2m9cpmLxAixYtolKsB5HcBiPwQKbiTBPh3bSpaPXbDCJ0ivQ3mUpu2r0cHjgwzYqQRszxBPXGLvsspOiSZskTGBu9KJ6Q94+BtCg2wLRlNZmovxhjZipACv0FPAW8U78K/TgmI+7WFgKfMAP70YJQh8WiREvRvEOlomYww5uUDjvqANd99H9XHLgv0Ko7SkFHRc+jnKSmeTrPATIrLr7uxKd28qpf3hpByL82XorKKUssBcslcD5yg/+2Tpbg== 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 GV1PR08MB8743.eurprd08.prod.outlook.com (2603:10a6:150:87::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.23; Wed, 5 Feb 2025 07:15:57 +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; Wed, 5 Feb 2025 07:15:57 +0000 From: Stefan Herbrechtsmeier To: bitbake-devel@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [RFC PATCH 15/15] tests: fetch: fix nonsensical mirror uris in FetcherNetworkTest Date: Wed, 5 Feb 2025 08:15:38 +0100 Message-ID: <20250205071538.2681-15-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20250205071538.2681-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR4P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::6) To GV1PR08MB8426.eurprd08.prod.outlook.com (2603:10a6:150:8a::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR08MB8426:EE_|GV1PR08MB8743:EE_ X-MS-Office365-Filtering-Correlation-Id: c4569bc8-3a0f-40e3-6ce5-08dd45b4eedf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|13003099007|38350700014; X-Microsoft-Antispam-Message-Info: fWpqkjy1eUyyI0X/wFBfe74x780shu4B6eCdMBxMfwKOv7qB9+sGJr9FlRojZ1mpEvU4UiSPGiRurSjzKtuYw9X6dOiWJeSRKhIcCyvlCCv9tjQoWC53JHojzuKTBibFluJ2G68NV+VOWCeVucAV4mtBpb0nPoCpQlaL9fTMGqfDknV5ocG8HrWB2pxlLVghoOuuaSQ5yIM01wnpnbfIK9ouZFfxPoCVkhDXOis/0KOAE+DzBxSUAnNMyh2IcbgeXCA9G31sXeBQziTUARqDE8OH7dluSchIFBWnIKi+tLqvmLegr/SXyacohKhEApboch0IISq16U8kvqVrPztwSqByjEBmLUlC7IW4wJw0jRgwEXNfVFMjFvWWadhd8dEo+Tqhr56paO+OlhnTm50jUmP40LgzQg+D63N3mUud0Rbuh1Z9f+ySa71ziIVjgRybt9DTsrMSDOqatrNFerae9cA5FQBRZGAMCyepH9w+t2vB5JvXWJVvKnCUQZnfpCx/VUzg6ACTl+/3Sje2yY5W+ufOxirRMshkOc+01nOCQTjErYAAwgrVMGO/9BOMChs+o4ZrLhhQSxUXm59h9CNsaNX7yvXwZ0cJVf7HrzI3YIpBir1ev4Sw2OuFNM6U10oQT/MKpxVL1o5CF4WBAxvR1Azwy2TUNBgiSKukzOsyD1RyDDkByWm9WfQ58Lb3b+d7VJFCuXowspiO5bwW+1sx8xwvH/E0esh8Hmm4i48ixVyyZw0kd9xsl7C7j4elfMnM7/m0NyS7cWXspFMcGmWceY9sYJYxv74gH1NHWY0h5gwXzVKGDAMspybU2ooOTNWSCoGrf8H5HWLZjIcltaa/LY7UTlAHqU6PO9ObBZHMB1vDvsp8CLczhaTfGn6rIzmxVe0EZ/k++7DAzym6m5ym8yx2eqa2gyM3sE8RmfYgA4octpLI3bzpsYTLsvjtzx0fCCs3n516UrMigXzQv0zOYi85cjIB88/WKbAqIPDJhZwcSO+plJLOzIioK/YsHyMKwdM33yVa1+63IE+q76xOkJbU5hJI3tKPMq9A/gxGkHnuPIkJUzZ/uH/dI6Cd9sj4UG2z2Xqh3ltGYa8GEx0B1j72Um+FR0hGu2vubKe14/W5VOz8ucvBY5Tqg44kjIJQUUlGD5U0iNscH0oxbDwMTGhEbgqv0AA+aoC1Okd22PSgJx6yXlAoayK8gMOPpwH+2R7wJ9RG0bfKiuY6YXkZOz33X2wer2aA29c0mk993Iob0zLlesvWlqW6bvllR4ay3OWPUO+XsPPvOv4ms/7J6kV9yk3JbMXrlm13DosXogSK8/8GbCO6Kp/a6M6AOXsqU1ToxvCSYn5zmATr76UXLHlF2UpX4bewBZfmDk8+vfPpzsBUUx08E/0BVH/44hkh 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)(1800799024)(52116014)(376014)(366016)(13003099007)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ciezELMa/HLM8otrRYwqlH/bsdSe1KwhWSVK2Wxm57GWAGivRLEzWHDn8z4mdoczA4stpECjFXb28fRD2a52soDE0PAcOUI3rrE+kQKP0oZbXf29B0XyudPA/Q3BVZZLk/rhaVPcrxs/Xwiu80XQXsUfpT5yy2zdsaLjxL5gfgxZXqevMQKWHb65/H9RPqd/7DJHpAKEX3eZP5xwBFvvoekMY1WVhhSuyldKy0tKE0D4yBs+B7NBKXZg7DHDnTIC7hwq2Jh1hSep0baOjS1qOFXKoN7OcO2KgiDrtNjUWiwFzOPY4ZBjjBdU2KosZ7G8Pz1pPCtOZH8lHvDOx1qAlFWZs2615DXP+2/o7aiJ+S4cAvKu80u6TxUWSpav/H6YtYpXXK1Go7NZ7JjzWrYDNo12E3R6QZCLfCjhalEJmUyT84atH7/l0IQFcYg7a+OkQAlLZ3fJmpSwoh7hxkkU6nVvO+kkVsi54k9WZWPWQSDq0wJd75xSEFUvlO1WcKUsGNbD5AHijXH2+W1X1dcZwTEPMf5MQ0/3cR+R4FnODIvLMff0hC4Z5T1OX2h+fU62rYYQLiotdVnWz8WIGsW++egTwN307Am/rZsFSCsQoO+GvUam/LoUM6yd6rUNuDE/8il8aOqUVca1VCp5uSlP4ol6bEr859Ke60iNMwK4TBlcCMUdTYpOVqRsqD0NrJI/k3bT3efBr5z6Yr2El/mdDUNUa/K+zxmrvrUqzSs2JIyjl8LUccvvXKV+Ylzvas6SSQSFFBtg81w9cWLBEMixiOYdi/IXu5edKp+/6MdQE+z/s5GrNvEMrgmyVgQghvdlMAkd7dfu+urs9yxUtstknPKXZNOmgmylhK3qQ6F3wykIa7CkPbB5Tvgeuz3aUQb2RaQgY9XlRR0q+3RRfJZltPrV0DWeAq12JIfTnsOGyhr54IZ0XhmniqIUaBX/Wh5B6Ilx4oaDe2N3dI8F++zXPWT7yXx2VP+oCAQ3Kd2+TnuL8DNi4B+m7JhRbv/W+BsszMeHQkEplat+YuHqW9fZSvWX2NpEtnOiG3Y8VgPtaOHJmzMmYW2wkxKg9g0+RmcfJGr35A/G9FXy+HVGMYx4+eoaD5EleXNz36hWaBw4ccWVlM5ctrPVHn0nw5sCqwf3bKbCOvRltEftWjxruhMfW8MopFYaLErfx5f6WRV48URo9kJOL+9pF9EcKpz0n++GyT9lIaW/W8KqToaq0hFOKUlFEAOSznX1RpyXKelNPAjUpZ0447OIHSf0TtYOAI3RJuaUkMk9pTj3kv3ffao/Sw3/I8WF/XuHrm8RmezfIE4iqgyoXM5g05U2P2oRiUSeQgTY3Tm54hyfVNwKhCsMGXB9OimPw5bN8L1uxFcGa1i3zIophegdfV1frZJuZKIxT645vsIMqFp4NehYF/70ITKUy0GoYJFWyx50kf4PSDVWp5iHknNac3WuiampHgUhiRppY0AZ8L8DWD+m/jbkJo85EyQdg9dVKquNHKjmBwluEUd7EOObDRzktx8kDsy1doLpZ9l7arMTS+fuQavfinCzXCV3cGgCZsdTEOxCMWI8/XcJkfn3lXx4yuIAmKw8Lak8f1xHPghrNSVfwoqqhw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4569bc8-3a0f-40e3-6ce5-08dd45b4eedf X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB8426.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2025 07:15:56.1986 (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: WNe+WU/pnFJ8HnGg9BTxx9ke28Jdi0cwHHaeU/ceGqc22dcbi8I7031QjxZOwHKwoSBnwW3ATWmgsHcDXG+0hg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB8743 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 ; Wed, 05 Feb 2025 07:16:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17148 From: Stefan Herbrechtsmeier A replacement inside a mirror URI for a local path should use a plain replacement and shouldn’t use a placeholder without PATH or BASENAME replacement. A replacement inside a mirror URI for a remote path should use a placeholder to match the whole path to replace it and shouldn’t depend on the implementation which wrongly replace the base name with the base name of the downloadfilename. Signed-off-by: Stefan Herbrechtsmeier --- lib/bb/tests/fetch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 5d247f6a9..3d8b932ac 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -1027,7 +1027,7 @@ class FetcherNetworkTest(FetcherTest): @skipIfNoNetwork() def test_fetch_file_mirror_of_mirror(self): self.d.setVar("FILESPATH", ".") - self.d.setVar("MIRRORS", "http://.*/.* file:///some1where/ file:///some1where/.* file://some2where/ file://some2where/.* https://downloads.yoctoproject.org/releases/bitbake") + self.d.setVar("MIRRORS", "http://.*/.* file:///some1where/ file:///some1where/ file://some2where/ file://some2where/ https://downloads.yoctoproject.org/releases/bitbake/") fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d) os.mkdir(self.dldir + "/some2where") fetcher.download() @@ -1056,7 +1056,7 @@ class FetcherNetworkTest(FetcherTest): @skipIfNoNetwork() # BZ13039 def test_fetch_premirror_specify_downloadfilename_specific_uri(self): - self.d.setVar("PREMIRRORS", "http://invalid.yoctoproject.org/releases/bitbake https://downloads.yoctoproject.org/releases/bitbake") + self.d.setVar("PREMIRRORS", "http://invalid.yoctoproject.org/releases/bitbake/.* https://downloads.yoctoproject.org/releases/bitbake") fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/1.0.tar.gz;downloadfilename=bitbake-1.0.tar.gz"], self.d) fetcher.download() self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749)