]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
rpm/rootfs.py: ensure exit 1 has a word boundary
authorAdam Duskett <adam.duskett@amarulasolutions.com>
Mon, 23 Feb 2026 15:39:22 +0000 (16:39 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 26 Feb 2026 11:39:04 +0000 (11:39 +0000)
Currently, If a package installed by dnf has the word "exit" followed by
"100%" in the log file, the rpm/rootfs.py regex matches a failure thanks to
the "exit 1"00%, such as the following:

[682/932] perl-module-test2-plugin-exit 100% |   0.0   B/s |   8.5 KiB |  00m00s

Add a `\b` to ensure there's a word boundary to prevent the error from happening.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/package_manager/rpm/rootfs.py

index 3ba539632063e328bf1ae852fc76debcc760f318..698685c06797ac34d1afe88096a43a675d1e3977 100644 (file)
@@ -14,7 +14,7 @@ class PkgRootfs(Rootfs):
     def __init__(self, d, manifest_dir, progress_reporter=None, logcatcher=None):
         super(PkgRootfs, self).__init__(d, progress_reporter, logcatcher)
         self.log_check_regex = r'(unpacking of archive failed|Cannot find package'\
-                               r'|exit 1|ERROR: |Error: |Error |ERROR '\
+                               r'|exit 1\b|ERROR: |Error: |Error |ERROR '\
                                r'|Failed |Failed: |Failed$|Failed\(\d+\):)'
 
         self.manifest = PkgManifest(d, manifest_dir)