diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-03-01 18:26:36 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-03-01 18:26:36 -0400 |
| commit | 1d39a530e386b2dc692d35120397ef95eaa8c1f7 (patch) | |
| tree | a769d2a3a6eb92fdb9d359afeeb6f38bdb71e0a0 /src/Propellor | |
| parent | 12e3179d7c1eb88211d0b54132af3dd7fa88daf7 (diff) | |
Apt.trustsKey: Use apt-key to add key rather than manually driving gpg, which seems to not work anymore.
Thanks, Russell Sim.
Diffstat (limited to 'src/Propellor')
| -rw-r--r-- | src/Propellor/Property/Apt.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index d44b5c38..7275205a 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -447,7 +447,7 @@ trustsKey k = trustsKey' k <!> untrustKey k trustsKey' :: AptKey -> Property DebianLike trustsKey' k = check (not <$> doesFileExist f) $ property desc $ makeChange $ do withHandle StdinHandle createProcessSuccess - (proc "gpg" ["--no-default-keyring", "--keyring", f, "--import", "-"]) $ \h -> do + (proc "apt-key" ["--keyring", f, "add", "-"]) $ \h -> do hPutStr h (pubkey k) hClose h nukeFile $ f ++ "~" -- gpg dropping |