From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 20 Nov 2024 07:05:59 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f56.google.com (mail-lf1-f56.google.com [209.85.167.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4AK65wRw004176 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Nov 2024 07:05:59 +0100 Received: by mail-lf1-f56.google.com with SMTP id 2adb3069b0e04-53d86e159e7sf5053199e87.3 for ; Tue, 19 Nov 2024 22:05:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1732082753; cv=pass; d=google.com; s=arc-20240605; b=kbKLP/jCsuerHGkLSNLGY20R8Y4+mwAN853prIDY5cFsGyjRawNq/h5128/En7LlZ0 pTCS8s9sCYKAlDsZ4RtRX7N9MPvsZg9PmWsLzSIeDuZkDuRR1NlnkIraOVp9k6D3tiUc 55RBol6+p2xHmtHdnzkqV6TtiF3aXAwk5fpPpoC37SsSzMhEzbKy+toEUMpt29eSCJEP z9Te/891jCWy7FrIm44aC+e+gxy4djxQDrYjmk1z7/phcv680inUE/Im934R7SID09EL XVp/ejtVr4ofw4ujZ69a+vTnm3RZsKCbZvfP9/2KSWFNKk0YnZQQ22xbS3e3KMY2w0Z2 Mbsw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:user-agent :content-transfer-encoding:references:in-reply-to:date:cc:to:from :subject:message-id:sender:dkim-signature; bh=eibKgFCIno8gK3CDJEANx2jDTEvI2Nq3G5Mw0FdvblA=; fh=6H7LQ7LKUrNXNeEwJ1ytkRRGMnfTRz0FUWZ2FR7bIY8=; b=I4MkHER5Rq5uFBJ89lCGwNEWPXtZoHt1KSC1xIxqUME5b7hbYxRjzHNazXVsi8yDge qKUSa3535QTuK7/JTemhZD9/xoo7apaYWW75/VPbx6A0dasJ95hLfiFzBPcvw67gtYK9 86fyKoY2jutssG3wOwNCAWikUjPxJHr4JM5wyOzD5aOugICWPxv7sBxl2Y6fo4MkEjub lxCHVJhb+cKa22765u3x2Xgf7bDL1NebuxfCZbbTJgQTxARDfae6h7yFB9BaIKzq6X+k onBug9Nsc34BG3NciGCcFpUODtUkj39XtXPO7oHHhdAt3Ut8RO6doZhjzcchQVECPyzp ly2g==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1732082753; x=1732687553; darn=ilbers.de; 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:user-agent:content-transfer-encoding :references:in-reply-to:date:cc:to:from:subject:message-id:sender :from:to:cc:subject:date:message-id:reply-to; bh=eibKgFCIno8gK3CDJEANx2jDTEvI2Nq3G5Mw0FdvblA=; b=IkFbNQP3mOLpvIsJEA+uBCeADl7zcDHwMlBMiRkJrpFPQ6dtWMroTRSttjq2kbxBSk 0GB5i9UWWK1T6gj5ZnSx7oF9Xmvu0BC9FFO8OA/dvVBu7/EBv2xrjlhQafvejladJmI6 YaEtb9ALy92Rz6GVVznCD6qrbQwnry/PLBkhDUbGJ2a59XYh1IjBg5Gzgd//AxANRXu+ 4vmh4VEJNuDKvwRJ0Pt1aIwfDxQ0x8s1YsNigDmzBuzC7/FlV1J6aikM7Ickp+n1HK67 Vy1pNU1YTfwNfK66cwCCGf74txiHSm1Zam5aqgtil5DWo13WKuaGEEbzkdvbX0VQiBX1 jvPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732082753; x=1732687553; 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 :user-agent:content-transfer-encoding:references:in-reply-to:date:cc :to:from:subject:message-id:x-beenthere:x-gm-message-state:sender :from:to:cc:subject:date:message-id:reply-to; bh=eibKgFCIno8gK3CDJEANx2jDTEvI2Nq3G5Mw0FdvblA=; b=n0vx6nuSgjosIcyUjDPeeiHn5bexvgWz5xV7axlIgmaEutBbrZbKgTDj9bZG3F5OQm s+5LN768tq+AnDXocvO1VwATIbRXdow1Pv69E+OtHDJkCDRaQG9uZVhk3cBlQV8QuBrB yc4PEZO7GAlbRvp8SWwGEuUr5QAc7p3WuvBI4BY6vfQw0WChmYfXZz5FT3IANOw0F7et R2DTIzW5orkAPiA6PQcWd4eJYbU+xfc8esFUx1hUql3qs84U2KhZ+ajszcNH0VvTJ6RL zoQP5I0O5ayG3XYQh7kW6jDtbEah4NlQMTlkm5CH1gPRQW/jKlc8mevl8ZQeFTykThJ+ LlKQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXbhTASG6B+A58VqSvWzwAiu+5wEm9t3FgQoFQrCYNzN64MJComDw3JfggJJBTi4P4Cm1Li@ilbers.de X-Gm-Message-State: AOJu0Yy3T0/+WvcjXdiZKMqs645MAfrch5PIB6e8ZncBPfKpNbs/YbxH Yxn2WPtSnuKCyTTwtuRAAW6TB41I9oIV7SOPMOfzZ5fUi9900yDo X-Google-Smtp-Source: AGHT+IEKd9QjERHSNKl5St563Rezi3ciqzpmWgMjnGRbCA4fBlTdM/uQc/NqoBeqxXoe3y47YMa8PA== X-Received: by 2002:a19:6a0b:0:b0:53d:c283:7e75 with SMTP id 2adb3069b0e04-53dc2837f92mr261801e87.7.1732082752484; Tue, 19 Nov 2024 22:05:52 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:281b:b0:53d:a277:8ab0 with SMTP id 2adb3069b0e04-53da55c1d55ls351055e87.2.-pod-prod-01-eu; Tue, 19 Nov 2024 22:05:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV6Q2kKIPtZvpzVtjGqcP3LfadmWp5Y88TutI4dvqekf9CMjY+5qwOJfU6FRqt6KqbLSBwEWmKAOa2a@googlegroups.com X-Received: by 2002:a05:6512:1c1:b0:53b:4c7c:a7be with SMTP id 2adb3069b0e04-53dc136aa15mr372066e87.42.1732082749603; Tue, 19 Nov 2024 22:05:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732082749; cv=none; d=google.com; s=arc-20240605; b=eGwQL+FNDOhN0U09/bt3m8Gz+DtjQQec6pCsoe1aUBPq38+dPbb4S4bLpF2Kk6TRh6 RLHoTY3m35wD32Jxk0ycuBdsSfdv8xPnq9X0Sr1QM6UzcZJ3PfmTZke/BRzT3mb3/sQ8 I1EyCovqLnXpiHdb+vI5dflSeYMfPz2LxKM/aeYgo8Ccfw5K9RO0fLWB1jbi5IoL9Jrn 2uJohjXAUnomVNKoPHybiD57DOjgdAJSDCbAqFozwK3T3BOqco2b4VLik8c28EBKVsnJ aM8f3TpdIouYwxAtyGU7FkYP5TEYq63VtFs5u66y1b7V5GIL95/ylTVfzBL0FzIMPOXN +LHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id; bh=AKv2iZy0BkoyK7/pHO2wam0sbDNsIpidM4LKD29d28U=; fh=pMpFjqQ4yg7LLCBvk6IA02STIBe2DnixBqcx/4ga5CY=; b=Fada1rlMFHZxTZ/Xw4PAB+hOvG0sw8ytoESpUR8XbS7iTeq1w0/XyA47cVM3afreJQ fvGZMM5hF31BcZlCiIoF+5dZm7bFh2Nnjxbz8b95kmxtk+XbCEFFC6+uwBM5afQMpEi+ cnrspD0by9JMpc2pOZc/9TEyLib9sy66OMy9YsHKKEiGWCmQyiS3eUDcXEkLOZIA/Jwp TuNIVAbpeW/xLLiffCg1EUAkFPi8VoCjA02kvDzG2sKSOvDu/AWg05FNiH2VP+yh+mYj TjREEZYPf+8gN0RTo9ETouNJIY7do7vV2T4MJPSHf7R3NLVi79h5MUyysqCsR/aRC94J Yp8Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-53dbd3fcaadsi72511e87.6.2024.11.19.22.05.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Nov 2024 22:05:49 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4AK65k1P004167 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Nov 2024 07:05:47 +0100 Message-ID: <47c5e76990ba95e85e07df4542d3aa74e6e002f3.camel@ilbers.de> Subject: Re: [PATCH v2] classes/repository: use the proper filename to find the packages under repo From: Uladzimir Bely To: srinuvasan.a@siemens.com, isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, cedric.hombourger@siemens.com Date: Wed, 20 Nov 2024 09:05:46 +0300 In-Reply-To: <20241117154515.906833-1-srinuvasan.a@siemens.com> References: <2e8f538fc2a14f8f235819e33656fb6e2a850012.camel@siemens.com> <20241117154515.906833-1-srinuvasan.a@siemens.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.54.1 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-TUID: wB/DT7n1Spbv On Sun, 2024-11-17 at 21:15 +0530, srinuvasan.a via isar-users wrote: > From: srinuvasan >=20 > This patch fixes the issue in repo_contians_package function, here we > are adding a few packages to repo again even though the repo already > contains those > packages, ideally we should skip those >=20 > reproduce the issue: >=20 > 1. Create the base-apt > 2. Again retrigger the base-apt (assume that there is no changes in > the previously built base-apt) >=20 > here we observed few packages getting added again to the APT, even > those > packages already available in the repo. >=20 > Basically few packages having the epoch version (automake, git-man, > ssh) in the download folder, > but the same packages are cached in the repo without the epoch > version, due to this > mismatch, it tries to add=C2=A0the packages again into the repo, to fix > this issue, > just find the package name in the repo without the epoch version. >=20 > Signed-off-by: srinuvasan > --- > =C2=A0meta/classes/repository.bbclass | 3 ++- > =C2=A01 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/meta/classes/repository.bbclass > b/meta/classes/repository.bbclass > index 28e712fd..7379658d 100644 > --- a/meta/classes/repository.bbclass > +++ b/meta/classes/repository.bbclass > @@ -99,7 +99,8 @@ repo_contains_package() { > =C2=A0=C2=A0=C2=A0=C2=A0 local file=3D"$2" > =C2=A0=C2=A0=C2=A0=C2=A0 local package > =C2=A0 > -=C2=A0=C2=A0=C2=A0 package=3D$(find ${dir} -name ${file##*/}) > +=C2=A0=C2=A0=C2=A0 file_name=3D$(echo "${file##*/}" | sed 's/[0-9]%3a//g= ') Not sure if epoch versions more than 9 exist for some packages, but I would add '\+' here to consider big epoch numbers: ``` $ echo git-man_1%3a2.39.5-0+deb12u1_all.deb | sed 's/[0-9]%3a//g' git-man_2.39.5-0+deb12u1_all.deb $ echo git-man_10%3a2.39.5-0+deb12u1_all.deb | sed 's/[0-9]%3a//g' git-man_12.39.5-0+deb12u1_all.deb $ echo git-man_10%3a2.39.5-0+deb12u1_all.deb | sed 's/[0-9]\+%3a//g' git-man_2.39.5-0+deb12u1_all.deb ``` > +=C2=A0=C2=A0=C2=A0 package=3D$(find ${dir} -name ${file_name}) > =C2=A0=C2=A0=C2=A0=C2=A0 if [ -n "$package" ]; then > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # yes > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cmp --silent "$package" = "$file" && return 0 > --=20 > 2.34.1 >=20 --=20 Best regards, Uladzimir. --=20 You received this message because you are subscribed to the Google Groups "= isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/= 47c5e76990ba95e85e07df4542d3aa74e6e002f3.camel%40ilbers.de.