build: sort.py: fix whitespace in entire profile #6593
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rusty-snake
reviewed
Dec 28, 2024
Changes:
* Strip whitespace at the beginning
* Strip whitespace at the end
* Ensure exactly one newline at the end
* Strip extraneous newlines
Also, for clarity print the git diff in the sort.py ci job, since the
specific lines changed are not printed by the sort.py script in this
case (as whitespace is fixed in the entire profile at once).
Command used to search and replace:
./contrib/sort.py etc/inc/*.inc etc/profile*/*.profile
This is a follow-up to netblue30#6556.
Update contrib/sort.py
kmk3
force-pushed
the
sort-py-strip-newlines
branch
from
bbd08c3 to
28e823b
Compare
rusty-snake
approved these changes
Dec 28, 2024
kmk3
added a commit
that referenced
this pull request
Jan 4, 2025
kmk3
added a commit
that referenced
this pull request
Jan 4, 2025
Currently it adds a newline to empty files.
Before:
$ : >foo.profile
$ contrib/sort.py foo.profile
sort.py: checking 1 profile(s)...
foo.profile:(fixed whitespace)
[ Fixed ] foo.profile
$ od -A n -t x1 foo.profile
0a
After:
$ : >foo.profile
$ contrib/sort.py foo.profile
sort.py: checking 1 profile(s)...
$
This amends commit c222b7f ("build: sort.py: fix whitespace in entire
profile (#6593)", 2024-12-28).
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Jan 6, 2025
This amends commit c222b7f ("build: sort.py: fix whitespace in entire profile (netblue30#6593)", 2024-12-28).
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Jan 6, 2025
This amends commit c222b7f ("build: sort.py: fix whitespace in entire profile (netblue30#6593)", 2024-12-28).
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Jan 6, 2025
This amends commit c222b7f ("build: sort.py: fix whitespace in entire profile (netblue30#6593)", 2024-12-28).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
Also, for clarity print the git diff in the sort.py ci job, since the
specific lines changed are not printed by the sort.py script in this
case (as whitespace is fixed in the entire profile at once).
Command used to search and replace:
This is a follow-up to #6556.