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; Fri, 22 Nov 2024 06:48:45 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f183.google.com (mail-il1-f183.google.com [209.85.166.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4AM5mio2016354 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 22 Nov 2024 06:48:44 +0100 Received: by mail-il1-f183.google.com with SMTP id e9e14a558f8ab-3a75c23283csf14675205ab.0 for ; Thu, 21 Nov 2024 21:48:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1732254518; cv=pass; d=google.com; s=arc-20240605; b=Ve+dkdg80YdFCuQzzNDqNod8ORq36S70GGzLhbSAq/vMA/OrbsfgfIzG8lHLyy8lGD ssEK5lvstK0Ko3pW/9+rKgmSZdS8RgV1+4T+2GApw+hMLXABOAYwvHccMAUR8Sz7enFT p8ooQvG+kEd1HgoHy8ZgmnuVSlLjY/1MjakNFa7ONLfg6Hlc0VtpOi09GaXmSdDoNC0G /w8vJC69l/4W9DMbqBGhn144de+Dm7uYg/FROxQ+Fxr8AbwawyxvDvJtMfZktfrq/dRT BX5mCleUbQ70icii5YNobcsRYvdGHQSqp8pjvPrTArks41jVgcHwBH01aFv/8rscsZ5W tmFw== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rOjDycM7I3H3s1qCJFWVIjMB0G7Swf2PA44grXmX/UQ=; fh=A0Z9EhaifRBCZoFtERVCc2Jhkel3CNnsxD04SKPw5Ng=; b=Zs2bR2lPbkEmN5T4Zqbu+xeHlTnZSwmvh1R4HnYk3NkuzuLS4Lmb3lw8uE9D6zLPoV 8wfqbg9wmCyGnbN9pktP8j+rPLRgT8pSRjCT71BeGhJhMjDkqUX97hDA6U8U2wDGhzoe DrGmRyx1M3S3PA9hpTxiAPft5PgVgkp7nmIL2t58w1awOpLjgbYmiGC8Si2mJy1Xh+59 7SKjmpFlfMz94RgdeTeVh8g9VKyjf19nBpsDDot5MoggwDp0O2YEeU4CX5xjxe3kJqtm Od0YGa84bQrwrkjxH0a+UhSho8eNnS6a3DpOTWLbybjVIA8d7F9hJVq33xsVkmj1R/fo hIMQ==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="jsxMI/ic"; spf=pass (google.com: domain of fm-1212295-20241122054835d1e3b3a57eadb635f2-pqw2_2@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1212295-20241122054835d1e3b3a57eadb635f2-PQW2_2@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1732254518; x=1732859318; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=rOjDycM7I3H3s1qCJFWVIjMB0G7Swf2PA44grXmX/UQ=; b=sWSkmCgpXF/Y+9vnqmF4shOY7giS8XuwPP0r+12HmqVlWBAYOBUTJUNz8eCUHZQkhN Vc2tHmWaI/8tmgpdQ982Yt+psw1z1fyq7fMt66GfYsKCFAWRclcYkQR+NaclqToPrXH0 fFiFku7aVUjWXB4VH5gSRRv9iQeOAg1rALCzvNnHckwsKOirkihwlry9o63UjMtIdsZR cyofhC68tHRTq0zgPw0MEuOFYYYeq0sj+TnHKefOKbwH7+ypOlrI/tbqcZsYYYEVYkKi CCluTLq8o8ETurxbQR8+ZDZkORaRMiZgkbGOVqqWHGQSZ0ek+LsUSwycM4IixRK7YNsv 3vqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732254518; x=1732859318; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rOjDycM7I3H3s1qCJFWVIjMB0G7Swf2PA44grXmX/UQ=; b=r3BTJPDipz9DTUfXipGna0eDD6dAXZ1umyJw//XlP6J31I48vdt4aQuJn9j/4FHrmY dYoqvdLTwxbsNt0xXi3gwk0xntvz/7kem8YTfQ0Aha3mOKSfYo6ueGyVO/ucYQ2VDv9q E3Y5WGVqjY2Fbf2ue4RK1pHCBswCKrpuoY7sniFn61UPXqz5BdSeqrs6DnUIu3nIMIaC 7sayAQHrl/DqX3q6gzEDGmdhsz/jd8nzSwzegpbLH3HArSfmblHBe1aGF1B3WufCd8lh B/4km4vXeLgZK/AumrUpdmgwtaO2w/rgOv2ErrDBPj98Ga5fdowWe2r7LnQ2rAoE3YSN J2/A== X-Forwarded-Encrypted: i=2; AJvYcCW8pwd7aLhpgY7ibpqXCGyEkf8qulJJ/saAUxIz+Ri4LXrueAkXEtP2oqj3C9WrDTAZHjhH@ilbers.de X-Gm-Message-State: AOJu0YzK0oEaaRVWDDJbnXqcfgBFfazxjm5AZbUQSKCVgxobnwt3JdYR DQFnnk2dN5+XaKiWb1k10tnS5BAGCSo26X2DV41j3f/+HtKl7yVs X-Google-Smtp-Source: AGHT+IGdg+dtY6jE54jvqFGdyLTEUSLEW8YZvxjZ/A0RxTLQIZs5+b4X6M7K9rSA2SBQwq/2qq7uoQ== X-Received: by 2002:a92:ca4f:0:b0:3a7:9fff:1353 with SMTP id e9e14a558f8ab-3a79fff1550mr5939625ab.0.1732254518335; Thu, 21 Nov 2024 21:48:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1a6a:b0:3a7:90e5:fb73 with SMTP id e9e14a558f8ab-3a790e5fd12ls9099465ab.1.-pod-prod-00-us; Thu, 21 Nov 2024 21:48:37 -0800 (PST) X-Received: by 2002:a05:6602:6405:b0:83b:5306:d24d with SMTP id ca18e2360f4ac-83ecd16c889mr207171839f.6.1732254517370; Thu, 21 Nov 2024 21:48:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732254517; cv=none; d=google.com; s=arc-20240605; b=LKSZcMDm99tFD1a4h2tSiNZgVhmEdYngGwVYWTkELa9o22Pt8OTMtN8dYyujsiRDwR GPQAumj4QL6eSPVyeuqlAXovwE0L30QjMGLZOrCGXLPy3lOvs2/8U7snEDtH8CFNRmHT 55g4ugbeucjxipCUQMNQiPF0HeK1rDEUffpjTnaH3i1+IQ54ptNcqV2qoBLZLobJ0Um1 H442SydfV5dqaKbbB//mX9iiaY1xyYFK0+guKnrC/e39snd2hnL6wsZt3hfmZrgNjOJ9 swKhnwX43OC6lDp/JNPCNU1o0Jpmts4rH6sjgJ5RTCadd10LQIUO4EVhXP+l1B+gGLYW Hy2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=MvZTZO6ymXu/XgtNeRIYIPW8N+zVQWmfxmSIAJ9LbD8=; fh=1z37pEVhqwMLlkT4FDzOga7XBsM6Rzv6sXOq0pipxqo=; b=OLA4ENnaMU8hbRMlYVnxle6a0fCLlT6832iw16iDLyqmrLjpj5YYohRrZRTlGhs4IL IFGiGccXUJleiXbW39eF+Xfuz2NOYmWEecNBLhNpAqyGXG2ckOFvHTpY485Ysue1FmrS +p6nUKaJ/oCr3KgZLuItK78rEop4GXTgMc6wBGzml0Ne9nadoxo8DS1KYYTCSwlXVLNk InuYu4xlbIgNlwwLum8+cnaH76TrB1CdOCkrptQLaom+ogdHeawtjlVPbdXcTyuVZGCe 6SllBK/HNZZ8VRQsiZp0C8OZ/+MLvYeXc9if05giQFv8+QebIsz5fdjXwSnIr/G2ByKV mV4w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="jsxMI/ic"; spf=pass (google.com: domain of fm-1212295-20241122054835d1e3b3a57eadb635f2-pqw2_2@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1212295-20241122054835d1e3b3a57eadb635f2-PQW2_2@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id ca18e2360f4ac-83eccf851b3si4150439f.0.2024.11.21.21.48.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2024 21:48:37 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1212295-20241122054835d1e3b3a57eadb635f2-pqw2_2@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20241122054835d1e3b3a57eadb635f2 for ; Fri, 22 Nov 2024 06:48:35 +0100 From: "'Cedric Hombourger' via isar-users" To: isar-users@googlegroups.com Cc: Cedric Hombourger Subject: [PATCH 2/3] repository: align repo_contains_package signature with other repo functions Date: Fri, 22 Nov 2024 06:48:15 +0100 Message-Id: <20241122054816.3371334-3-cedric.hombourger@siemens.com> In-Reply-To: <20241122054816.3371334-1-cedric.hombourger@siemens.com> References: <20241122054816.3371334-1-cedric.hombourger@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1212295:519-21489:flowmailer X-Original-Sender: cedric.hombourger@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b="jsxMI/ic"; spf=pass (google.com: domain of fm-1212295-20241122054835d1e3b3a57eadb635f2-pqw2_2@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1212295-20241122054835d1e3b3a57eadb635f2-PQW2_2@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Cedric Hombourger Reply-To: Cedric Hombourger Content-Type: text/plain; charset="UTF-8" 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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-TUID: iHoqt7A2SwoP All repository functions take four arguments: - path to the repository - path to the database used by the repository management tool - codename - file/package repo_contains_package was the only function deviating from this scheme and its current implementation only takes a repository path and a file. Since the repositoty class was introduced to hide implementation details (so we could move away from reprepro if we wanted to), align that function with others. The only caller found in the repository (base-apt) was changed to use the new (standard) API. Signed-off-by: Cedric Hombourger --- meta/classes/repository.bbclass | 4 +++- meta/recipes-devtools/base-apt/base-apt.bb | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index 42d15823..b20ec091 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -93,7 +93,9 @@ repo_del_package() { repo_contains_package() { local dir="$1" - local file="$2" + local dbdir="$2" + local codename="$3" + local file="$4" local package package=$(find ${dir} -name ${file##*/}) diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 2766bc71..4fad76c5 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -24,7 +24,10 @@ populate_base_apt() { # Check if this package is already in base-apt ret=0 - repo_contains_package "${REPO_BASE_DIR}/${base_distro}" "${package}" || + repo_contains_package "${REPO_BASE_DIR}/${base_distro}" \ + "${REPO_BASE_DB_DIR}"/"${base_distro}" \ + "${BASE_DISTRO_CODENAME}" \ + "${package}" || ret=$? [ "${ret}" = "0" ] && continue if [ "${ret}" = "1" ]; then -- 2.34.1 -- 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 email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20241122054816.3371334-3-cedric.hombourger%40siemens.com.