diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-04-05 09:33:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-05 09:33:20 +0200 |
| commit | b7047c2bc2752f0e0f6763b9a771eda53677124a (patch) | |
| tree | 97cf533b4eed586b77fb9174b97f0d500d0928be | |
| parent | 949b98cab8a186b98bf87e64374b8d0848c55271 (diff) | |
| parent | 76756ccb3ab1f06a034878d6cb50672f5c8d1331 (diff) | |
| download | rust-b7047c2bc2752f0e0f6763b9a771eda53677124a.tar.gz rust-b7047c2bc2752f0e0f6763b9a771eda53677124a.zip | |
Rollup merge of #95234 - ben0x539:nixquotes, r=Dylan-DPC
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.
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 71b8f3c4553..0b6bdf47419 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -678,7 +678,7 @@ class RustBuild(object): # The latter one does not exist on NixOS when using tmpfs as root. try: with open("/etc/os-release", "r") as f: - if not any(line.strip() == "ID=nixos" for line in f): + if not any(l.strip() in ["ID=nixos", "ID='nixos'", 'ID="nixos"'] for l in f): return except FileNotFoundError: return |