diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-12-26 12:08:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-26 12:09:38 -0400 |
| commit | 5605c9665e57b22c7415691984f31f75b3337cd9 (patch) | |
| tree | 8f5790d1bb4dab6220e21449caf6ed1d5f802405 /src/Propellor/Property | |
| parent | 1d868470e4ec6ec6211206003279ac4bc8465c4f (diff) | |
| parent | 44bf67b7a2da75ef80e32d6409cc41a6ab8b6ffe (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property')
| -rw-r--r-- | src/Propellor/Property/Debootstrap.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Gpg.hs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs index f8cb6e0e..db114e01 100644 --- a/src/Propellor/Property/Debootstrap.hs +++ b/src/Propellor/Property/Debootstrap.hs @@ -148,7 +148,7 @@ sourceInstall' = withTmpDir "debootstrap" $ \tmpd -> do . filter ("debootstrap_" `isInfixOf`) . filter (".tar." `isInfixOf`) . extractUrls baseurl <$> - readFileStrictAnyEncoding indexfile + readFileStrict indexfile nukeFile indexfile tarfile <- case urls of diff --git a/src/Propellor/Property/Gpg.hs b/src/Propellor/Property/Gpg.hs index 74e9df5a..27baa4ba 100644 --- a/src/Propellor/Property/Gpg.hs +++ b/src/Propellor/Property/Gpg.hs @@ -2,7 +2,6 @@ module Propellor.Property.Gpg where import Propellor.Base import qualified Propellor.Property.Apt as Apt -import Utility.FileSystemEncoding import System.PosixCompat @@ -35,7 +34,6 @@ keyImported key@(GpgKeyId keyid) user@(User u) = prop ( return NoChange , makeChange $ withHandle StdinHandle createProcessSuccess (proc "su" ["-c", "gpg --import", u]) $ \h -> do - fileEncoding h hPutStr h (unlines keylines) hClose h ) |