os-release: preserve fields from being excessively quoted#164068
Merged
balsoft merged 1 commit intoNixOS:masterfrom Mar 16, 2022
Merged
os-release: preserve fields from being excessively quoted#164068balsoft merged 1 commit intoNixOS:masterfrom
balsoft merged 1 commit intoNixOS:masterfrom
Conversation
Member
Author
|
I can also add lowercase, whitespace and other checks, just in case :D |
Member
Author
|
With this patch, ID field is generated correctly |
Member
|
This breaks a lot of existing checks for nixos, as it replaces ID=nixos with ID="nixos".
If checks are broken, they should be fixed as there is nothing wrong with having the fields without spaces quoted as you correctly point out:
Assignments that do not include these special characters may be enclosed in quotes too, but this is optional.
Having a hardcoded list of fields seems like a suboptimal way to solve it, so in order of preference:
1. fix the places that break because they assume a literal ID=nixos (just out curiosity what exactly breaks?)
2. if the value contains characters outside A–Z, a–z, 0–9, quote it - otherwise don't. And this should be regardless of the field.
A hardcoded workaround for 2 specific fields is not the way to go so NAK on this specific solution.
|
Member
Author
E.g rust-analyzer’s vscode extension (I patched it), Airshipper, probably many more unexpected scripts. |
Member
|
I'd still argue that these downstream consumers are broken, but to avoid pissing off too many people, please change this to look for non-alphanummeric in the values and then write them out un-quoted in that case.
|
Member
Author
|
@peterhoeg please, re-review |
balsoft
reviewed
Mar 15, 2022
99108a2 to
a9007d1
Compare
peterhoeg
requested changes
Mar 15, 2022
(In cases it is unnecessary)
balsoft
approved these changes
Mar 15, 2022
Member
|
Thank you all! |
ben0x539
added a commit
to ben0x539/rust
that referenced
this pull request
Mar 23, 2022
Per https://www.freedesktop.org/software/systemd/man/os-release.html, > Variable assignment values must be enclosed in double or single quotes > if they include spaces, semicolons or other special characters outside > of A–Z, a–z, 0–9. (Assignments that do not include these special > characters may be enclosed in quotes too, but this is optional.) So, past `ID=nixos`, let's also check for `ID='nixos'` and `ID="nixos"`. One of these is necessary between NixOS/nixpkgs#162168 and NixOS/nixpkgs#164068, but this seems more correct either way.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 5, 2022
bootstrap.py: nixos check in /etc/os-release with quotes Per https://www.freedesktop.org/software/systemd/man/os-release.html, > Variable assignment values must be enclosed in double or single quotes > if they include spaces, semicolons or other special characters outside > of A–Z, a–z, 0–9. (Assignments that do not include these special > characters may be enclosed in quotes too, but this is optional.) So, past `ID=nixos`, let's also check for `ID='nixos'` and `ID="nixos"`. One of these is necessary between NixOS/nixpkgs#162168 and NixOS/nixpkgs#164068, but this seems more correct either way.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 5, 2022
bootstrap.py: nixos check in /etc/os-release with quotes Per https://www.freedesktop.org/software/systemd/man/os-release.html, > Variable assignment values must be enclosed in double or single quotes > if they include spaces, semicolons or other special characters outside > of A–Z, a–z, 0–9. (Assignments that do not include these special > characters may be enclosed in quotes too, but this is optional.) So, past `ID=nixos`, let's also check for `ID='nixos'` and `ID="nixos"`. One of these is necessary between NixOS/nixpkgs#162168 and NixOS/nixpkgs#164068, but this seems more correct either way.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description of changes
Recent change made
ID=nixoschecks, used by many programs to patch static nixos binaries and other reasons, obsolete.This removes ID and ID_LIKE fields from being quoted — as quoting those
violatesshould never be necessary according to os-release file formatThings done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes