From patchwork Thu Jan 20 08:23:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Louis Rannou X-Patchwork-Id: 1582064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=Br8Eska2; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13b; helo=mail-lf1-x13b.google.com; envelope-from=swupdate+bncbdf3nyphvearbnnzushqmgqen3vh7iy@googlegroups.com; receiver=) Received: from mail-lf1-x13b.google.com (mail-lf1-x13b.google.com [IPv6:2a00:1450:4864:20::13b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JfbFq6dWFz9sPC for ; Thu, 20 Jan 2022 19:26:38 +1100 (AEDT) Received: by mail-lf1-x13b.google.com with SMTP id w2-20020ac25982000000b00433f92e2d36sf1230255lfn.15 for ; Thu, 20 Jan 2022 00:26:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1642667189; cv=pass; d=google.com; s=arc-20160816; b=VFV+QWD1V7Wm9coLfjJqqM2D14FXWdhlfoWepW6M51tDONtPAfekhUVoB8Nt3zvQu5 /BduuFehxiVzZ3tcEUu3ILc5qGq3d6keMeCjt+5jhvCpdSxjykjrLSojnTNW2L/l31km leHWT1zObBrPTkrNQqkDQWaA7o8DV80mmyyhmxvnQot9TQYkDv0sIp3j/aACJICuPLqX IHI/apfz26mzLWf0xV4lhfFQ7IC0PArCIjMURWMQ8oYTxboDTh943zT9hWcbK7m5HNPB Fk+MVnUvC8/+iwWHWudadT0YFeuzyxYX4ngeU+PZzeaKrZrNuEYduN2/UPr0e8wpqpLq fr2Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=DXMj7aLfjyWe12e1BOoov0NfOTs4NArwcQAxtXFIPFQ=; b=XJqae80nw0ZBm4meVNAElhvYJjb/dPD4GvtO+KYioreR5c15m6H+6tJupUAyOLwC9r PZWkV+ugMPpShLOU52JOwrhyxnyfIlLnkvJG/gFwpfiSGOz1mI00q7A65frr2WQFhTOC fUu/V9oB06MYyUfyHYpzaWVzDeMWuUXfrwwBcgS2I5M7OeJwoV4BDeHCxwPxaYK4JMhM WYSup4GBD6pq/tNeHfgHZp7PEOZHdWGA1txWw7vh8vBddjESx+ITFt0Vwedmk9Wdgdiz e+55wTQZ3gagF7l5cxKfLuItGoa73xaGH6qQZnX+Znvku/fK6m2CKij2P4PJfg0xQzDa 9dlQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gresille.org header.s=mail header.b=AqREOaPb; spf=pass (google.com: domain of louis.rannou@gresille.org designates 91.216.110.77 as permitted sender) smtp.mailfrom=louis.rannou@gresille.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gresille.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=DXMj7aLfjyWe12e1BOoov0NfOTs4NArwcQAxtXFIPFQ=; b=Br8Eska2Dt9H1T4IV6RaOBRkSPcesLvaD2ZxGUlB+1Kvg0v3/vFTPn38OAP9WXBJFO z911jfmXDjoGTcBrXoX/fv/0+mgUQgf7ndd4ueQZ+IlVBMEq8osWpp4FoIA7hAozOC4L 7Hp93HwjAdYKfTjvjQABJU+Zg81x+cimNbkoZxSLfW4cLk/+5L4aA12URN2NEOUD4ZRg wDMwVMl7QToETjUuBOEFZvjUJDg4lU0JARrCDJLjjWi32f5U9qpO7P0bLrmHZeyB6etn oqhpD8wiWN++rtE2ebFKmnIQ6i6bOflPARQsRgQA1TmeATVJtf1obLRN+gn7MvBQiNnY eJrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=DXMj7aLfjyWe12e1BOoov0NfOTs4NArwcQAxtXFIPFQ=; b=73AOjn0aah3LRfdTobOGwlo0xmNolabP2sK926qSzH2bXAmsgMsqNP3eeEJva09SgE Q7tjy11UUezUCpUMruw0UOH6A0qsFDDoPWp0bLI/1Yw8+XB6fy82+Cx6yr709tCQXD29 WJUtFuoWU2ga9fYqgRcroSDzSTWTz4V+VNarzrfQUr+VapnJ+NcjrLyu3+CNzubdWBaM GgKa/wFUfHSwIy+5HOZnzTgPyjBcVeFqsHt6o/JiTOR5ZHTAFkiSBgwV6vrWfZ0RhGHG yPfHTxP5MS8Hp7CVl8CvvJwnDtM0sQWOvJ24yz95T28IylcJzhQyWjfKKp0mgxYL27Pl Fsdg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM5313Z+8JgEyYZKl7pn1XhABcjmL5z7DXi/z9VcyGW3WftWHe3y70 soEBzqmJY5/Xl3j1suS3xOI= X-Google-Smtp-Source: ABdhPJyl3W313MmJHoVWWuWjtNrIUJRWe0dDKZA63CQpbYqY5byoeZkg7jPe3C09Cu/XmTsH4xI1Aw== X-Received: by 2002:a19:7619:: with SMTP id c25mr30418776lff.302.1642667189502; Thu, 20 Jan 2022 00:26:29 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:651c:1592:: with SMTP id h18ls743779ljq.7.gmail; Thu, 20 Jan 2022 00:26:28 -0800 (PST) X-Received: by 2002:a2e:b791:: with SMTP id n17mr28013626ljo.307.1642667188562; Thu, 20 Jan 2022 00:26:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642667188; cv=none; d=google.com; s=arc-20160816; b=D1LXI6bLEabc1LnRyZQvuw1LLtEEi/B+wQlKhOJpwr360e+iIAV7rFgvOEARkAwBkM y6tmF/ZvUEd79nyYR1ZN9Dhvx0C/qTVqt2hEmtZS85Kl1AnNWYCcgPH9QCPi5Mxhel10 8AOis6L+Jt3CTDI4RP39YfRWFD9ZhHO8VrYbUSai2k/GtveDvpG2lr/YmsHRnyLpHe7G MPnsgoNARu+TsrZ7sdpP2xmXiJecm5qXqPOySVUZI09KqgzVZYaL0qdfRT40T4tTbX0D iOQCt4NzDUmGK4dXYE0oge7m/OL4lCBnlItjd/tdDb6IUEQExG2ZNfgoj7FJcFsdjXkH zuUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=hlVt2qiwINtoQtMteXV8OI79HEuELWqpOTlTg36T4+Y=; b=opDWcuQgUKKsYOzhB6lfr0VtG1bc0vdKWK2GQV5eRfaoiKrMRYhPdO4qfNXq/M6LjP XCMyB54HqHs3YpRhjg/Ior6oJpEO7Bi4X31P7P0WGZD04bCQoo4te6O5aajzUo4Zf5wO WI+I0gzFrPdMr2jL+y97n/YyrLzqMPgbiTU9THYkDPyVTo/VUj8uYnbrzmm8CbloCi33 ChW6JAxIt7Hu5Q3GXNOWqUsNtjv6ZkWWT4lWilqoz2KKjFiQ3I1VqaJZ1W1pSugm6g6V a5gT8D5dqlH4DEaN0n6Tiko9KkNkYoDI4ndZnPOSkevPF0Tjq/H8P0sVTzeZ+4Oci/AK KU2Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gresille.org header.s=mail header.b=AqREOaPb; spf=pass (google.com: domain of louis.rannou@gresille.org designates 91.216.110.77 as permitted sender) smtp.mailfrom=louis.rannou@gresille.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gresille.org Received: from mouche.gresille.org (mail.gresille.org. [91.216.110.77]) by gmr-mx.google.com with ESMTPS id u2si85522lfq.10.2022.01.20.00.26.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Jan 2022 00:26:28 -0800 (PST) Received-SPF: pass (google.com: domain of louis.rannou@gresille.org designates 91.216.110.77 as permitted sender) client-ip=91.216.110.77; Received: from localhost.localdomain (unknown [IPv6:2001:912:1480:370::]) by mouche.gresille.org (Postfix) with ESMTPSA id 644AB5F718; Thu, 20 Jan 2022 09:26:27 +0100 (CET) From: Louis Rannou To: swupdate@googlegroups.com Cc: Louis Rannou Subject: [swupdate] [meta-swupdate][PATCH] swupdate-common: fix sha256 regex Date: Thu, 20 Jan 2022 09:23:35 +0100 Message-Id: <20220120082335.154025-1-louis.rannou@gresille.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Rspamd-Server: mouche X-Spamd-Result: default: False [4.90 / 15.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; DKIM_SIGNED(0.00)[gresille.org:s=mail]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; authenticated_user(0.00)[]; ASN(0.00)[asn:51083, ipnet:2001:912:1000::/36, country:FR] X-Rspamd-Queue-Id: 644AB5F718 X-Original-Sender: louis.rannou@gresille.org X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gresille.org header.s=mail header.b=AqREOaPb; spf=pass (google.com: domain of louis.rannou@gresille.org designates 91.216.110.77 as permitted sender) smtp.mailfrom=louis.rannou@gresille.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gresille.org Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Change sha256 regex brackets to parenthesis to apply only on line with 'sha256' and 'version'. Signed-off-by: Louis Rannou --- classes/swupdate-common.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index 7d06c96..c6e92fe 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -81,7 +81,7 @@ def swupdate_write_sha256(s): for line in f: shastr = r"sha256.+=.+@(.+\")" #m = re.match(r"^(?P.+)sha256.+=.+(?P\w+)", line) - m = re.match(r"^(?P.+)[sha256|version].+[=:].*(?P[\'\"])@(?P.*)(?P=quote)", line) + m = re.match(r"^(?P.+)(sha256|version).+[=:].*(?P[\'\"])@(?P.*)(?P=quote)", line) if m: filename = m.group('filename') hash = swupdate_get_sha256(s, filename)