Message ID | 20240316124236.7987-1-marcus.folkesson@gmail.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <swupdate+bncBDNYR2FTVYEBBCNF22XQMGQEFQ3RNLI@googlegroups.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=tj1FEF02; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Yssvzetl; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::237; helo=mail-lj1-x237.google.com; envelope-from=swupdate+bncbdnyr2ftvyebbcnf22xqmgqefq3rnli@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x237.google.com (mail-lj1-x237.google.com [IPv6:2a00:1450:4864:20::237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Txgcf1RJ2z23qh for <incoming@patchwork.ozlabs.org>; Sat, 16 Mar 2024 23:37:36 +1100 (AEDT) Received: by mail-lj1-x237.google.com with SMTP id 38308e7fff4ca-2d48b182917sf13371901fa.1 for <incoming@patchwork.ozlabs.org>; Sat, 16 Mar 2024 05:37:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710592651; cv=pass; d=google.com; s=arc-20160816; b=vCO55c821Owc6b9oVxPM2A+TwhRbGo3MmL2OpkSRJ4fWGPXzVLFt4M6Kinx5isZiUb 9n6jW6QgHRM56LM6RukcTdl1p63ifmWTQ5XHZHAVKz9sUP0sjGeSyyhA1w+DxMmLQrVn oPLKas0DF88BD4Q8qAnK/oYQtsAeT3nukIWPxu3wpyc6uUiFj2Tz55l+DtoNDCoVYmxi uasKB4N8Q2D3gUE3q38jS8jCbPAQKQVm7mVPnesJtxaKyNkQ1Fet/WQMfWMaAvC6Vwfy iWnqjwtqqKKz85ASBvHW2p894z7oMEI/KIUTlLfrg2ZacvtsTtyksvA/65PDDf3PtrGC tDqA== 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:dkim-signature; bh=04yaDp4b64HodZsSxCoqrYCqAeVE0WiTlu07HVt5RJ4=; fh=3xHIx157WXEQeiA8hEND7P27B/lZ1gtkUp5497UJXNk=; b=sCG+2agrb6hDFZorXOkJJy2X3kr2RqLB/F/OerFOLg2S9gEKcqW4yeL7RzdNwLQ6cL szIiLjkyfmB53oMBpf/npVA4Rs23+ZZQzxqsyz5QR+r58q685mdcvGRb9tDJ7W3DD0lr BefuzH4Niqt5nz3oLBw2Xzs0RthBtwk0ZUlXRIohcIurhO+8tXqCPRy2X5TUFENIm5lJ 7vfWcTixdXxqKOWuFWa7F+c4h9Oj3Q3ehZZzIrxjAuFOL8rN+xchaULLj1wOG3mUKVkT x0Ibguh1YMuBQ7dt5GywHWm3TIaF1dqrgLKclZF6/NUsW+8bOY0L57Eoj0PxTei844fW SqvQ==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PCNOGP5a; spf=pass (google.com: domain of marcus.folkesson@gmail.com designates 2a00:1450:4864:20::235 as permitted sender) smtp.mailfrom=marcus.folkesson@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1710592651; x=1711197451; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=04yaDp4b64HodZsSxCoqrYCqAeVE0WiTlu07HVt5RJ4=; b=tj1FEF02SXVKBCg0J6YkEZRsFjyegTPwWMt3ewlqMlXhcr5DdwbceFJl8zoFDRxOsX /V4rSWMJwOFFQ8jLuNXUtWTgqe+FBm1qu9tlvsM2hvBHiv6jKuWxf/k9+UI8lcHc4i/K g7fETpAavl48CB/mHA2NZKa+Dy9+hjNTcRGGBZzdH9/+2weHcunvFIbju2SEMPRUgdl4 2OSt+gDj36fIhJVsPN2mX192m2CTfmfe38DxKEDH1q3KWAgMCYuXVub7ithzLuZdguHO HsqjIZ/xBsCFSXsHo6MaKul7QcFtFcPyhLoPaPYIEoU06AiShEK/f/dNZFdMuSwy4be3 ce+g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710592651; x=1711197451; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=04yaDp4b64HodZsSxCoqrYCqAeVE0WiTlu07HVt5RJ4=; b=YssvzetlT7AJL9DAQjgs5adX37Xk1hQKkQWuf/q5/6h+UWFFo/kwJWZv0zJD0Ki8uG gkf9gTApGmLNEkyGKdn6eOeKF00jQX1DaszhHTjOfcdoWtAQ+ZvC+6mioeM4o/CybYSq /2p2grKAiGNK/dU3GPaAoF45bEjhQ1MlK2gySMoECYfpw8eeJmHETMgiiDjNPKw08+vk mMxuUTxs0hIDcIiahyHfoqEcFMXTMlugo9gpJWCK8qjVf4UW9qfEtIe5tzC9Ey6wl0Qq hpD9EAChLaSNsGr3XM867QT3rGjf9aKP48vcd0rYLZWQRBlTixHrWTkMgihguuy8Eztb Mr7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710592651; x=1711197451; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=04yaDp4b64HodZsSxCoqrYCqAeVE0WiTlu07HVt5RJ4=; b=aaSf9zDLXvAC7hgRTfdlLO7/dHneYuhJHL7ub6XoJWT+EewzndNCtEYS4YX+Tp2VA9 HJ0gwcFM3IYwpYM2U1KySMjcVYwRfsxq1m2+mVCeGhEzWIX/F3HJZdz9iJzCr0Xd/Vva gnmI4MwXQ2TeYobuog2x9qDuEJXUq5n5yws7HL+RqW6PJuSgqNCAv2Qbr+K/MDAJP5+3 QAw1gWPrTzULhPMy7C2bYpqsEpcUjAuqHhW9Folx3OxFDoCEgJ5RGvP90VMy+KqIikDI qmd8Bx8XTpjRz2yGZ/H0cqmnTFV7OrIZ5LEdkd8IK5hVkTm2MybNgU8vwhZ8nnR5lt/f rbXg== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUP8Tb50mAvTyK/PFtqmRUG/NX0luku1aIIup1mzJ20Y0yAET0YZip6GgTpo+2UwF0TMMxS0ogYg6j2eUBWJF0A4TeG1LEu9LNbtEZomQ== X-Gm-Message-State: AOJu0YxdYG8c73H2CL5LD0rUz7hmbddPPGoi1GX0mAEfQuyRSCmPOsjG mZc4S7Y/d3AwwY5JK/fS5zAmq/2mZQDz0zNcyknjJmM3asgL+Zql X-Google-Smtp-Source: AGHT+IFIsMZInRQuO49pxYCMizaAqObHkoKswsS5EhxOX7Fvttk0QqelghmFiNBlRXgKTezJtu6cIQ== X-Received: by 2002:a2e:a716:0:b0:2d4:727c:94bf with SMTP id s22-20020a2ea716000000b002d4727c94bfmr4673242lje.31.1710592649967; Sat, 16 Mar 2024 05:37:29 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:9b46:0:b0:2d4:122c:9578 with SMTP id o6-20020a2e9b46000000b002d4122c9578ls529724ljj.2.-pod-prod-01-eu; Sat, 16 Mar 2024 05:37:27 -0700 (PDT) X-Received: by 2002:a2e:a30b:0:b0:2d4:72be:e2c6 with SMTP id l11-20020a2ea30b000000b002d472bee2c6mr4951834lje.52.1710592646980; Sat, 16 Mar 2024 05:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710592646; cv=none; d=google.com; s=arc-20160816; b=i2svllldlie9YB08FZCQPHXZoF1Lu+9Yk/jWWSthPXKrocDiYFFSSE3gru20VeRbzP E8j2BpkLHNbQMFEqkUq/VF7F7cDOEe75F1Al00mtGn+z4pLewMheC0oprlzLqxKszlS9 8RHtpd2uhQZC9qhS2VfuyPoQKj16be6CDoOjooHhWYTuNaVeQyyXvnDNes5hiObh0J6y yduewj8wkbznkAngn8B3URvssFCpOTEBG5fLM/amLg10WqzIBKvvN5BtUADYCWfZiIh/ 24osWKdVEW7C+Z4/6ocu4VxQ+JoMEJ219J5D5ZTNzgarVa+qlDAf6k5PKK2ygRiYOItY Adqg== 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=CFJHXe7u9pXw86D8Dxfw2aBeDaFVdpj0uzfwDLR1hKQ=; fh=byqoZYyGIF5nyUrxbqMCSaBgugTQ0N3rC9IbdDbCkgM=; b=KVmBRXl+9lVtsnNRHMAkMssitvG9OrlJDBgzoZaD0PjSf1A0L+L3ExeqEk1QVnIQTj 3bEN9oVCPezRpcNgybSpMG0amo4vgwGYzyJv48rqur33snOxhA7ivnKcnuHwbHOWYbjx rw96JhtXu8S3rfK0/5XbckJZq9HjVEFfRJFqgB/RJj3niD6YYU/7JPbatzWjwsJnIBVu q8ahfJ9l9APClnODobUXY9r0LpIt8aCa7uYjqgE6LCQv09AdukfE/HP5g0xlefw1Hrs0 YnHvv1Qb7c2WPhYnHZSLyncajdQ9cjYXIBM+2s/QK3hnxZEtsAOhk4OTfHJkyAX+r/Ng SuNw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PCNOGP5a; spf=pass (google.com: domain of marcus.folkesson@gmail.com designates 2a00:1450:4864:20::235 as permitted sender) smtp.mailfrom=marcus.folkesson@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com. [2a00:1450:4864:20::235]) by gmr-mx.google.com with ESMTPS id u18-20020a2e2e12000000b002d22c31334fsi326659lju.4.2024.03.16.05.37.26 for <swupdate@googlegroups.com> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 16 Mar 2024 05:37:26 -0700 (PDT) Received-SPF: pass (google.com: domain of marcus.folkesson@gmail.com designates 2a00:1450:4864:20::235 as permitted sender) client-ip=2a00:1450:4864:20::235; Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2d220e39907so41968011fa.1 for <swupdate@googlegroups.com>; Sat, 16 Mar 2024 05:37:26 -0700 (PDT) X-Received: by 2002:a05:651c:820:b0:2d4:7532:92f2 with SMTP id r32-20020a05651c082000b002d4753292f2mr3797359ljb.45.1710592645893; Sat, 16 Mar 2024 05:37:25 -0700 (PDT) Received: from localhost.localdomain (c80-216-168-104.bredband.tele2.se. [80.216.168.104]) by smtp.gmail.com with ESMTPSA id k23-20020a2e9217000000b002d2d8d2ee45sm777680ljg.12.2024.03.16.05.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Mar 2024 05:37:25 -0700 (PDT) From: Marcus Folkesson <marcus.folkesson@gmail.com> To: swupdate@googlegroups.com Cc: marcus.folkesson@gmail.com Subject: [swupdate] [PATCH] core/artifacts_versions: Allow four numbers in the version string again Date: Sat, 16 Mar 2024 13:42:36 +0100 Message-ID: <20240316124236.7987-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: Marcus.Folkesson@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PCNOGP5a; spf=pass (google.com: domain of marcus.folkesson@gmail.com designates 2a00:1450:4864:20::235 as permitted sender) smtp.mailfrom=marcus.folkesson@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: <swupdate.googlegroups.com> X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: <https://groups.google.com/group/swupdate/post>, <mailto:swupdate@googlegroups.com> List-Help: <https://groups.google.com/support/>, <mailto:swupdate+help@googlegroups.com> List-Archive: <https://groups.google.com/group/swupdate List-Subscribe: <https://groups.google.com/group/swupdate/subscribe>, <mailto:swupdate+subscribe@googlegroups.com> List-Unsubscribe: <mailto:googlegroups-manage+605343134186+unsubscribe@googlegroups.com>, <https://groups.google.com/group/swupdate/subscribe> |
Series |
core/artifacts_versions: Allow four numbers in the version string again
|
expand
|
diff --git a/core/artifacts_versions.c b/core/artifacts_versions.c index 9695243a..3ac50351 100644 --- a/core/artifacts_versions.c +++ b/core/artifacts_versions.c @@ -174,7 +174,7 @@ static bool version_to_number(const char *version_string, __u64 *version_number) } version = (version << 16) | fld; } - if (count >= 4) { + if (count > 4) { DEBUG("Version %s had more than 4 numbers, trailing numbers will be ignored", version_string); } else if (count > 0) {
The forth number is ignored. Fix so that version strings in the format <major>.<minor>.<rev>.<build> works again. Can be verified by set four numbers as version and look for the following ouput during update: [DEBUG] : SWUPDATE running : [version_to_number] : Version 10.0.2.0 had more than 4 numbers, trailing numbers will be ignored Fixes: e1df95fa ("compare_versions: make is_oldstyle_version fail when number > 65535") Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> --- core/artifacts_versions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)