From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH 3/3] deb-dl-dir: grep exact version when caching source package
Date: Fri, 8 Apr 2022 07:31:10 +0200 [thread overview]
Message-ID: <20220408053110.10416-4-ubely@ilbers.de> (raw)
In-Reply-To: <20220408053110.10416-1-ubely@ilbers.de>
This fixes false-positive detection of package belonging to the current
build. For example, version "1:1.2.11.dfsg-2" of zlib1g package matches
"... status installed zlib1g:amd64 1:1.2.11.dfsg-2+deb11u1" line in
dpkg.log that was left by larger version.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta/classes/deb-dl-dir.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index f49f1c2a..eace5102 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -12,7 +12,7 @@ is_not_part_of_current_build() {
# Since we are parsing all the debs in DEBDIR, we can to some extend
# try to eliminate some debs that are not part of the current multiconfig
# build using the below method.
- local output="$( grep -hs "status installed ${package}:${arch} ${version}" \
+ local output="$( grep -hs "status installed ${package}:${arch} ${version}$" \
"${IMAGE_ROOTFS}"/var/log/dpkg.log \
"${BUILDCHROOT_HOST_DIR}"/var/log/dpkg.log \
"${BUILDCHROOT_TARGET_DIR}"/var/log/dpkg.log | head -1 )"
--
2.20.1
next prev parent reply other threads:[~2022-04-08 5:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-08 5:31 [PATCH 0/3] Fix failed repro test impact on other tests Uladzimir Bely
2022-04-08 5:31 ` [PATCH 1/3] ci: cleanup tmp after repro test failed Uladzimir Bely
2022-04-08 5:31 ` [PATCH 2/3] ci: rename tmp in repro tests to access logs Uladzimir Bely
2022-04-08 5:31 ` Uladzimir Bely [this message]
2022-05-04 7:49 ` [PATCH 0/3] Fix failed repro test impact on other tests Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220408053110.10416-4-ubely@ilbers.de \
--to=ubely@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox