Skip to content

libstore: say what actually blocks SSH on Windows #16382

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.

Sign up for GitHub

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

Open
awsmadi wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

libstore: say what actually blocks SSH on Windows #16382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libstore/include/nix/store/ssh.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private:
void addCommonSSHOpts(OsStrings & args);
bool isMasterRunning();

#ifndef _WIN32 // TODO re-enable on Windows, once we can fork.
#ifndef _WIN32 // TODO re-enable on Windows; needs startProcess(), which forks to run a child callback.
std::filesystem::path startMaster();
#endif

Expand Down
7 changes: 4 additions & 3 deletions src/libstore/ssh.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,9 @@ Strings createSSHEnv()

std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(OsStrings && command, OsStrings && extraSshArgs)
{
#ifdef _WIN32 // TODO re-enable on Windows, once we can fork.
throw UnimplementedError("cannot yet SSH on windows because spawning processes is not yet implemented");
#ifdef _WIN32 // TODO re-enable on Windows; needs startProcess(), which forks to run a child callback.
throw UnimplementedError(
"cannot yet SSH on Windows: this needs startProcess(), which forks to run a child callback");
#else
std::filesystem::path socketPath = startMaster();

Expand Down Expand Up @@ -229,7 +230,7 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(OsStrings && comm
#endif
}

#ifndef _WIN32 // TODO re-enable on Windows, once we can fork.
#ifndef _WIN32 // TODO re-enable on Windows; needs startProcess(), which forks to run a child callback.

std::filesystem::path SSHMaster::startMaster()
{
Expand Down
Loading