summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2019-01-18 12:11:38 -0400
committerJoey Hess2019-01-18 12:11:38 -0400
commitb3324e7ef7d17c909c59b598f36e84f576135cdd (patch)
tree359e7355910b37a13fbbd9952859dd549008a580
parent7da5391e0c21943157a4f49f0e4133ee92fd22c7 (diff)
Fix --spin crash when ~/.ssh/ directory did not already exist.
-rw-r--r--debian/changelog1
-rw-r--r--doc/forum/__126____47__.ssh__47__propellor:_createDirectory:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_b3a31b1fb2fbe7ada648d758398686ca._comment7
-rw-r--r--src/Propellor/Ssh.hs2
3 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8bff519b..44187394 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ propellor (5.6.0) UNRELEASED; urgency=medium
* Avoid exposing the constructor of OuterMetaTypesWitness, to avoid
the kind of mistake that led to the withOS bug.
* Merged Utility changes from git-annex.
+ * Fix --spin crash when ~/.ssh/ directory did not already exist.
-- Joey Hess <id@joeyh.name> Tue, 23 Oct 2018 11:37:16 -0400
diff --git a/doc/forum/__126____47__.ssh__47__propellor:_createDirectory:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_b3a31b1fb2fbe7ada648d758398686ca._comment b/doc/forum/__126____47__.ssh__47__propellor:_createDirectory:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_b3a31b1fb2fbe7ada648d758398686ca._comment
new file mode 100644
index 00000000..c961763d
--- /dev/null
+++ b/doc/forum/__126____47__.ssh__47__propellor:_createDirectory:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_b3a31b1fb2fbe7ada648d758398686ca._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2019-01-18T16:11:19Z"
+ content="""
+Think I've fixed this now.
+"""]]
diff --git a/src/Propellor/Ssh.hs b/src/Propellor/Ssh.hs
index a8f50ed0..9ba15d86 100644
--- a/src/Propellor/Ssh.hs
+++ b/src/Propellor/Ssh.hs
@@ -19,7 +19,7 @@ sshCachingParams :: HostName -> IO [CommandParam]
sshCachingParams hn = do
home <- myHomeDir
let socketfile = socketFile home hn
- createDirectoryIfMissing False (takeDirectory socketfile)
+ createDirectoryIfMissing True (takeDirectory socketfile)
let ps =
[ Param "-o"
, Param ("ControlPath=" ++ socketfile)