diff options
| author | Benjamin Herr <git@1d6.org> | 2022-03-23 00:03:13 -0700 |
|---|---|---|
| committer | Benjamin Herr <git@1d6.org> | 2022-03-23 13:00:38 -0700 |
| commit | 76756ccb3ab1f06a034878d6cb50672f5c8d1331 (patch) | |
| tree | 08b653c54dce890e64c7e7618a4e6679c8582eeb /src/bootstrap | |
| parent | 2b50739b4978936750a0c8de404ff184e49114f9 (diff) | |
| download | rust-76756ccb3ab1f06a034878d6cb50672f5c8d1331.tar.gz rust-76756ccb3ab1f06a034878d6cb50672f5c8d1331.zip | |
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.
Diffstat (limited to 'src/bootstrap')
| -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 |