Skip to content

Commit

Permalink
Relax rpm__installed_but_unpackaged_files_found
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kwk committed Jun 26, 2024
1 parent 751d698 commit f7dc767
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion snapshot_manager/snapshot_manager/build_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def handle_golden_file(cause: ErrorCause, ctx: str) -> tuple[ErrorCause, str]:

logging.info(" Checking for installed but unackaged files...")
ret, ctx, _ = util.grep_file(
pattern=r"(?s)RPM build errors:\n.* Installed \(but unpackaged\) file\(s\) found:.*Finish",
pattern=r"(?s)Installed \(but unpackaged\) file\(s\) found:.*Finish",
extra_args="-Pzo",
filepath=build_log_file,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@

```
Installed (but unpackaged) file(s) found:
/usr/lib/debug/usr/lib64/libomptarget.rtl.s390x.so.19.0pre20240320.gf5f3d5d6534f0a-19.0.0~pre20240320.gf5f3d5d6534f0a-1.fc38.s390x.debug
/usr/lib64/libomptarget.rtl.s390x.so
/usr/lib64/libomptarget.rtl.s390x.so.19.0pre20240320.gf5f3d5d6534f0a

RPM build errors:
Installed (but unpackaged) file(s) found:
/usr/lib/debug/usr/lib64/libomptarget.rtl.s390x.so.19.0pre20240320.gf5f3d5d6534f0a-19.0.0~pre20240320.gf5f3d5d6534f0a-1.fc38.s390x.debug
Expand Down

0 comments on commit f7dc767

Please sign in to comment.