Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/systemd-boot: fix incorrect string formatting #91073

Merged
merged 1 commit into from Jun 19, 2020

Conversation

danielfullmer
Copy link
Contributor

@danielfullmer danielfullmer commented Jun 18, 2020

Currently, this always writes default nixos-generation-%d.conf without
replacing the %d in the string. Python .format() is not equivalent to %

This was a suggested change in #90386 that I didn't check carefully enough. Apologies.

I'm just setting it back to what it was originally. At some point, we should probably replace all these with modern python f-strings, as well as using mypy / black / etc.

CC @flokli

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Currently, this always writes "default nixos-generation-%d.conf" without
replacing the "%d" in the string.
Python .format() is not equivalent to "%"
@flokli
Copy link
Contributor

flokli commented Jun 19, 2020

Ewww, missed that too. Thanks for the fix!

@flokli flokli merged commit a84cbb6 into NixOS:master Jun 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants