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 SCL leaking into Copr SRPM build #357

Merged
merged 1 commit into from
Jul 31, 2023
Merged

Conversation

ehelms
Copy link
Member

@ehelms ehelms commented Jul 31, 2023

The change to using the srpm_build role caused the scl field to become False which was interpreted as a string creating incorrect SRPM names. For example, False-nodejs-sass.

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

We already omit it if it's missing:

scl: "{{ scl | default(omit) }}"

We also have this code:

if scl:
command += ['--define', 'scl %s' % scl]

I get the impression a literal string False is passed somehow. Perhaps it should really be false since that's how YAML encodes booleans.

The change to using the srpm_build role caused the scl field to
become False which was interpreted as a string creating incorrect
SRPM names. For example, False-nodejs-sass.
@@ -3,7 +3,7 @@
srpm:
package: "{{ inventory_dir }}/{{ package_base_dir }}/{{ inventory_hostname }}"
output: "{{ build_srpm_output_dir }}"
scl: "{{ scl | default(omit) }}"
scl: "{{ build_srpm_scl | default(omit) }}"
Copy link
Member Author

Choose a reason for hiding this comment

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

Switching the namespaced parameter also seems to have properly fixed it.

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

I like this better :)

@ekohl ekohl merged commit 24a8822 into theforeman:master Jul 31, 2023
9 of 10 checks passed
@evgeni
Copy link
Member

evgeni commented Aug 8, 2023

And now it leaks false into koji builds?!

http://koji.katello.org/koji/taskinfo?taskID=562759

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.

3 participants