[PATCH 2/3] repository: align repo_contains_package signature with other repo functions

["'Cedric Hombourger' via isar-users" <isar-users@googlegroups.com>]

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 <cedric.hombourger@siemens.com>
---
 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.