diff options
| author | Joey Hess <joey@kitenet.net> | 2014-06-07 00:14:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-07 00:14:05 -0400 |
| commit | 582be8ebe00838509d978091d3c97ebeb1bf99de (patch) | |
| tree | ffef9bbb4ef25db03cf48962058146258993652f /src/Propellor/Property | |
| parent | 969db1ed56157aa202359c0f47fff783baba6eac (diff) | |
combineProperties no longer stops when a property fails; now it continues trying to satisfy all properties on the list before propigating the failure.
Audited all of my calls to combineProperties and they should be fine with
this behavior.. which suggests it's the right behavior.
Diffstat (limited to 'src/Propellor/Property')
| -rw-r--r-- | src/Propellor/Property/Ssh.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index ba0311cc..061f440c 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -97,7 +97,7 @@ hostKey keytype = combineProperties desc -- | Sets up a user with a ssh private key and public key pair -- from the site's PrivData. keyImported :: SshKeyType -> UserName -> Property -keyImported keytype user = combineProperties' desc +keyImported keytype user = combineProperties desc [ property desc (install writeFile (SshPubKey keytype user) ".pub") , property desc (install writeFileProtected (SshPrivKey keytype user) "") ] |