[PR #5942] [MERGED] build: firecfg.config sorting improvements #5742

New issue

Closed

opened 2026-05-05 10:44:05 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:44:05 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/5942
Author: @kmk3
Created: 8/5/2023
Status: ✅ Merged
Merged: 8/6/2023
Merged by: @kmk3

Base: master ← Head: build-firecfg-improvements

📝 Commits (2)

30f9ad9 build: improve comments in firecfg.config
ac2bd32 build: use ASCII sort on firecfg and check for duplicates

📊 Changes

2 files changed (+55 additions, -50 deletions)

View changed files

📝 ci/check/profiles/sort-firecfg.config.sh (+4 -1)
📝 src/firecfg/firecfg.config (+51 -49)

📄 Description

Remove the space after # for commented code and use # instead of -
for comments at the end of the line.

Currently the CI check does not consider certain special characters
(such as -) when sorting due to sort -d.

So remove -d, sort firecfg using LC_ALL=C and enforce that order.

Also add sort -u to check for duplicates.

This also allows the CI check to ignore normal comments (lines starting
with # ) anywhere in the file.

Relates to #4643.

_{🔄 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/5942 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 8/5/2023 **Status:** ✅ Merged **Merged:** 8/6/2023 **Merged by:** [@kmk3](https://github.com/kmk3) **Base:** `master` ← **Head:** `build-firecfg-improvements` --- ### 📝 Commits (2) - [`30f9ad9`](https://github.com/netblue30/firejail/commit/30f9ad908e10857d529dae1901a4b48bddf08bb7) build: improve comments in firecfg.config - [`ac2bd32`](https://github.com/netblue30/firejail/commit/ac2bd3211d02587b5e5b61b1f2f931d1f9e2a0ed) build: use ASCII sort on firecfg and check for duplicates ### 📊 Changes **2 files changed** (+55 additions, -50 deletions) <details> <summary>View changed files</summary> 📝 `ci/check/profiles/sort-firecfg.config.sh` (+4 -1) 📝 `src/firecfg/firecfg.config` (+51 -49) </details> ### 📄 Description Remove the space after `#` for commented code and use `#` instead of `-` for comments at the end of the line. Currently the CI check does not consider certain special characters (such as `-`) when sorting due to `sort -d`. So remove `-d`, sort firecfg using `LC_ALL=C` and enforce that order. Also add `sort -u` to check for duplicates. This also allows the CI check to ignore normal comments (lines starting with `# `) anywhere in the file. Relates to #4643. --- <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:44:05 -06:00

closed this issue
added the
pull-request
label

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#5742

No description provided.

Rows
Columns