Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing dependency #116

Merged
merged 1 commit into from
Aug 24, 2023
Merged

Fix missing dependency #116

merged 1 commit into from
Aug 24, 2023

Conversation

rhyw
Copy link
Contributor

@rhyw rhyw commented Aug 24, 2023

The bld2repo executive is being used, but corresponding package
modulemd-tools was not declared as a dependency earlier.

Copy link
Member

@kdudka kdudka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see that EPEL-7 builds in CI started to fail with:

error: line 53: Unknown tag: Recommends: modulemd-tools

... and there is no point in recommending modulemd-tools on RHEL-7/CentOS-7 anyway because there is no officially supported modulemd-tools package on such systems. Could you please make the recommendation conditional like this?

--- a/make-srpm.sh
+++ b/make-srpm.sh
@@ -125,13 +125,15 @@ Tool for plugging static analyzers into the build process, free of mock.
 %package -n csmock-common
 Summary: Core of csmock (a mock wrapper for Static Analysis tools)
 Requires: csdiff > 3.0.3
 Requires: csgcca
 Requires: cswrap
 Requires: mock
+%if 0%{?rhel} != 7
 Recommends: modulemd-tools
+%endif

 %description -n csmock-common
 This package contains the csmock tool that allows to scan SRPMs by Static
 Analysis tools in a fully automated way.

 %package -n csmock-plugin-bandit

The `bld2repo` executive is being used, but corresponding package
`modulemd-tools` was not declared as a dependency earlier.
@rhyw
Copy link
Contributor Author

rhyw commented Aug 24, 2023

Updated as per suggestions.

@kdudka kdudka self-assigned this Aug 24, 2023
Copy link
Member

@kdudka kdudka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merging, thanks!

@kdudka kdudka merged commit 5924ce8 into csutils:main Aug 24, 2023
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants