diff mbox series

[v8,5/7] meta/lib/oe/rootfs.py: assign warn_check regex string to a variable

Message ID 20260331095714.1285106-5-adam.duskett@amarulasolutions.com
State Under Review
Headers show
Series [v8,1/7] signing-keys.bb: Fix DISTRO_CODENAME truncation | expand

Commit Message

Adam Duskett March 31, 2026, 9:57 a.m. UTC 
DNF5 has a hardcoded warning when gpg checks are disabled.
As such, the rpm rootfs.py PkgRootfs class needs to have a
a negative lookahead filter specific for the following warning:
"Warning: skipped OpenPGP checks" if RPM_SIGN_PACKAGES != 1.

This filter is added in the next patch.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
 meta/lib/oe/rootfs.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 14befac8fa..7ef7e71f9e 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -25,6 +25,7 @@  class Rootfs(object, metaclass=ABCMeta):
         self.deploydir = self.d.getVar('IMGDEPLOYDIR')
         self.progress_reporter = progress_reporter
         self.logcatcher = logcatcher
+        self.warn_check_regex = r'^(warn|Warn|WARNING:)'
 
         self.install_order = Manifest.INSTALL_ORDER
 
@@ -84,7 +85,7 @@  class Rootfs(object, metaclass=ABCMeta):
                 bb.warn(msg)
 
     def _log_check_warn(self):
-        self._log_check_common('warning', '^(warn|Warn|WARNING:)')
+        self._log_check_common('warning', self.warn_check_regex)
 
     def _log_check_error(self):
         self._log_check_common('error', self.log_check_regex)