[PR #6593] [MERGED] build: sort.py: fix whitespace in entire profile #6085

Closed
opened 2026-05-05 10:50:26 -06:00 by gitea-mirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/6593
Author: @kmk3
Created: 12/28/2024
Status: Merged
Merged: 12/28/2024
Merged by: @kmk3

Base: masterHead: sort-py-strip-newlines


📝 Commits (1)

  • 28e823b build: sort.py: fix whitespace in entire profile

📊 Changes

11 files changed (+13 additions, -11 deletions)

View changed files

📝 .github/workflows/check-profiles.yml (+3 -1)
📝 contrib/sort.py (+10 -1)
📝 etc/profile-a-l/devhelp.profile (+0 -1)
📝 etc/profile-a-l/display-im6.q16.profile (+0 -1)
📝 etc/profile-a-l/empathy.profile (+0 -1)
📝 etc/profile-a-l/gnome-font-viewer.profile (+0 -1)
📝 etc/profile-a-l/gnome-recipes.profile (+0 -1)
📝 etc/profile-a-l/godot.profile (+0 -1)
📝 etc/profile-m-z/quassel.profile (+0 -1)
📝 etc/profile-m-z/rtorrent.profile (+0 -1)
📝 etc/profile-m-z/silentarmy.profile (+0 -1)

📄 Description

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 #6556.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/6593 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 12/28/2024 **Status:** ✅ Merged **Merged:** 12/28/2024 **Merged by:** [@kmk3](https://github.com/kmk3) **Base:** `master` ← **Head:** `sort-py-strip-newlines` --- ### 📝 Commits (1) - [`28e823b`](https://github.com/netblue30/firejail/commit/28e823bdf3ecf86d35d17ed032eed8ef423d0a70) build: sort.py: fix whitespace in entire profile ### 📊 Changes **11 files changed** (+13 additions, -11 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/check-profiles.yml` (+3 -1) 📝 `contrib/sort.py` (+10 -1) 📝 `etc/profile-a-l/devhelp.profile` (+0 -1) 📝 `etc/profile-a-l/display-im6.q16.profile` (+0 -1) 📝 `etc/profile-a-l/empathy.profile` (+0 -1) 📝 `etc/profile-a-l/gnome-font-viewer.profile` (+0 -1) 📝 `etc/profile-a-l/gnome-recipes.profile` (+0 -1) 📝 `etc/profile-a-l/godot.profile` (+0 -1) 📝 `etc/profile-m-z/quassel.profile` (+0 -1) 📝 `etc/profile-m-z/rtorrent.profile` (+0 -1) 📝 `etc/profile-m-z/silentarmy.profile` (+0 -1) </details> ### 📄 Description 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 #6556. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
gitea-mirror 2026-05-05 10:50:26 -06:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#6085
No description provided.