diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-07-24 20:51:43 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-07-24 20:51:43 -0400 |
| commit | 66ab157b81ec35812b2157735ca38c069b933b5b (patch) | |
| tree | fedd23bced943abccfa1af4b8ff276094ee513b9 | |
| parent | af73f097e430042f3355a93d23cf644d4895de7f (diff) | |
| parent | c7aa34a0e8b3cfbc309e1cffdcb69ca8fcc92766 (diff) | |
Merge branch 'master' of ssh://propellor.branchable.com
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust.mdwn b/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust.mdwn index ddb33ada..e67cf17e 100644 --- a/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust.mdwn +++ b/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust.mdwn @@ -2,4 +2,4 @@ Please consider merging branch `rngd-robust` of repo `https://git.spwhitton.name Several changes to the `Sbuild.keypairInsecurelyGenerated` property to make it more robust. Please see comments added by the diff. -> [[done]] ... however, that sleep 10 after killing rngd seems quite dodgy. --[[Joey]] +> <s>done</s> ... however, that sleep 10 after killing rngd seems quite dodgy. --[[Joey]] diff --git a/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust/comment_1_8164845c93baeaaccd7b29fef5d33df8._comment b/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust/comment_1_8164845c93baeaaccd7b29fef5d33df8._comment new file mode 100644 index 00000000..67e8b454 --- /dev/null +++ b/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust/comment_1_8164845c93baeaaccd7b29fef5d33df8._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="spwhitton" + subject="comment 1" + date="2016-07-24T23:40:45Z" + content=""" +Thanks for looking at this, though looking as master you haven't actually merged my branch. + +I'm reluctant to build in a lot of shell scripting logic to do better than `sleep 10`. Do you think it would be worth writing a property that ensures that a process with a given pid file has been killed? Or just an action in the propellor monad? +"""]] |