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

ssh: Add Newline to KnownHostsText #25818

Merged
merged 1 commit into from May 16, 2017
Merged

ssh: Add Newline to KnownHostsText #25818

merged 1 commit into from May 16, 2017

Conversation

jammerful
Copy link
Contributor

Motivation for this change

SSH expects a new line at the end of known_hosts file.
Without a new line the next new entry goes on the same line
as the last entry in known_hosts causing errors.

For example:

example1.com blahblahexample2.com blahblah

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Fits CONTRIBUTING.md.

SSH expects a new line at the end of known_hosts file.
Without a new line the next entry goes on the same line
as the last entry in known_hosts causing errors.
@mention-bot
Copy link

@jammerful, thanks for your PR! By analyzing the history of the files in this pull request, we identified @falsifian, @edolstra and @bluescreen303 to be potential reviewers.

@falsifian
Copy link
Contributor

falsifian commented May 16, 2017

The Travis error was:

The log length has exceeded the limit of 4 MB (this usually means that the test suite is raising the same exception over and over).

The job has been terminated

For some reason, the script decided to build a lot of stuff. Excerpt from the log:

=== Verifying that nixpkgs evaluates...
travis_fold:end:nixpkgs-verify
travis_fold:start:nixpkgs-manual
=== Checking nixpkgs manuals
these derivations will be built:
  /nix/store/zgjqdld5wbl0lia1wrbr3x6narhzd80p-ghc-8.0.2.drv
  /nix/store/8g2cc26k4dladnm7q4nps4gfvdbwpw3f-hscolour-1.24.1.drv
  /nix/store/0iq7i07czbillbgbnv6m3ghb169ihylx-string-qq-0.0.2.drv
  /nix/store/3g4p8krh0nb9qh5i2qxmclh2zx20pn7z-random-1.1.drv
  /nix/store/5m69wgpxw9ffz0glwabnbcxbgnvzqp8n-extensible-exceptions-0.1.1.4.drv
  /nix/store/a9p9ic50zzax792m6fml6003lvaic9sa-ansi-terminal-0.6.2.3.drv
  /nix/store/cqj4pavnxhxplmpsy5722c11c6869xqj-text-1.2.2.1.drv
  /nix/store/gxx1awram5nra1p6r9mp6aa3wgk4jvcp-xml-1.3.14.drv
  /nix/store/ixyh99x9yk8v4wbpy13f8dj8brfb00fx-ansi-wl-pprint-0.6.7.3.drv
  /nix/store/fq7d9bgs0x4iw19p7fympclldjpi90fs-mtl-2.2.1.drv
  /nix/store/igwsnxhy4ki9ql901v0gx57yf7nv0csi-regex-base-0.93.2.drv

and so on.

I don't see how ssh.nix should affect any of that (I tried manually introducing a syntax error into ssh.nix and patch built fine) so I'm going to assume something is wrong with the Travis CI setup.

@falsifian falsifian merged commit 2e966dc into NixOS:master May 16, 2017
@falsifian
Copy link
Contributor

Thanks!

@vcunat
Copy link
Member

vcunat commented May 16, 2017

Hydra has queued >8k jobs on master, even before this PR. It's not Travis that's broken but our workflow of merging larger rebuilds to master directly.

(h: assert h.hostNames != [];
concatStringsSep "," h.hostNames + " "
+ (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
);
)) + "\n";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of using both concatMapStringSep and adding a \n at the end, it would be simpler to just add a \n in the inner loop.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants