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

Replace whatever in changelog.erb and deb.changes.erb #1934

Merged

Conversation

lchabert
Copy link

In order to support packaging upload, the distribution must be set/aligned in changelog and changes files.
Required for example inside dput-ng repo upload app.

In order to support packaging upload, the distribution must be
set/aligned in changelog and changes files.
Required for example inside dput-ng repo upload app.
@lchabert
Copy link
Author

It will help to closes #1929

Copy link
Owner

@jordansissel jordansissel left a comment

Choose a reason for hiding this comment

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

Thank you for working on this!
I ran the test suite on this PR and found no new failures, nice!

That said, there's no test coverage for the .changes file nor for the changelog file either. I added one inline comment which I believe to cause a failure due, but I haven't tested this with any external Debian tools to confirm.

@@ -14,7 +14,7 @@ Description: <%= firstline %>
<%= remainder.collect { |l| l =~ /^ *$/ ? " ." : " #{l}" }.join("\n") %>
<% end -%>
Changes:
<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) whatever; urgency=medium
<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) <%= distribution %>; urgency=medium
Copy link
Owner

Choose a reason for hiding this comment

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

I think the leading whitespace removal will cause a breakage. Debian's changes file docs say this, from https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-changes - (Bold emphasis added by me)

The first line of the field value (the part on the same line as Changes:) is always empty. The content of the field is expressed as continuation lines, with each line indented by at least one space. Blank lines must be represented by a line consisting only of a space and a full stop (.).

Copy link
Author

Choose a reason for hiding this comment

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

Sorry, i didnt see the missing space. It sould be ok now.

@lchabert
Copy link
Author

lchabert commented Oct 3, 2022

As i wrote on you code comment, it's should be ok with the space now.

@jordansissel
Copy link
Owner

Thanks for the quick response! Change looks good :)

@jordansissel jordansissel merged commit 788387c into jordansissel:main Oct 3, 2022
@lchabert lchabert deleted the fix-changes-file-distribution branch October 5, 2022 15:05
@jordansissel
Copy link
Owner

fpm 1.15.0 is released and contains this improvement.

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