Skip to content

Commit f7dc767

Browse files
committed
Relax rpm__installed_but_unpackaged_files_found
We assumed that `RPM Errors:` would always appear before the `Installed (but unpackaged) file(s) found:` but it sometimes doesn't. This relaxes the detection a bit in order to discover this error more accurately.
1 parent 751d698 commit f7dc767

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

snapshot_manager/snapshot_manager/build_status.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def handle_golden_file(cause: ErrorCause, ctx: str) -> tuple[ErrorCause, str]:
337337

338338
logging.info(" Checking for installed but unackaged files...")
339339
ret, ctx, _ = util.grep_file(
340-
pattern=r"(?s)RPM build errors:\n.* Installed \(but unpackaged\) file\(s\) found:.*Finish",
340+
pattern=r"(?s)Installed \(but unpackaged\) file\(s\) found:.*Finish",
341341
extra_args="-Pzo",
342342
filepath=build_log_file,
343343
)

snapshot_manager/tests/test_logs/cause_rpm__installed_but_unpackaged_files_found.golden.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11

22
```
3+
Installed (but unpackaged) file(s) found:
4+
/usr/lib/debug/usr/lib64/libomptarget.rtl.s390x.so.19.0pre20240320.gf5f3d5d6534f0a-19.0.0~pre20240320.gf5f3d5d6534f0a-1.fc38.s390x.debug
5+
/usr/lib64/libomptarget.rtl.s390x.so
6+
/usr/lib64/libomptarget.rtl.s390x.so.19.0pre20240320.gf5f3d5d6534f0a
7+
38
RPM build errors:
49
Installed (but unpackaged) file(s) found:
510
/usr/lib/debug/usr/lib64/libomptarget.rtl.s390x.so.19.0pre20240320.gf5f3d5d6534f0a-19.0.0~pre20240320.gf5f3d5d6534f0a-1.fc38.s390x.debug

0 commit comments

Comments
 (0)