diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:00:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:00:01 -0400 |
| commit | 6be8289158fd30d972ac22766452e7c9dc809e6f (patch) | |
| tree | ba4929c7c8f27d2b43051f637394115cda39258b /Assistant/Ssh.hs | |
| parent | 6ea1214fa5d19241851a977ab82437563e2afc81 (diff) | |
| parent | 971ed2a464a1a1e4d5e650e32390d232cd354d9d (diff) | |
Merge branch 'master' into relativepaths
Conflicts:
Locations.hs
debian/changelog
Diffstat (limited to 'Assistant/Ssh.hs')
| -rw-r--r-- | Assistant/Ssh.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 7b82f4624..fa481a186 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -233,7 +233,8 @@ genSshKeyPair = withTmpDir "git-annex-keygen" $ \dir -> do setupSshKeyPair :: SshKeyPair -> SshData -> IO SshData setupSshKeyPair sshkeypair sshdata = do sshdir <- sshDir - createDirectoryIfMissing True $ parentDir $ sshdir </> sshprivkeyfile + createDirectoryIfMissing True $ + takeDirectory $ sshdir </> sshprivkeyfile unlessM (doesFileExist $ sshdir </> sshprivkeyfile) $ writeFileProtected (sshdir </> sshprivkeyfile) (sshPrivKey sshkeypair) |