summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Whitton2016-06-19 19:18:50 +0900
committerSean Whitton2016-06-19 19:18:50 +0900
commit874f2d0614639aaef6ac146f9878574ba855a90b (patch)
treef3274ce2a914e44c3f25ec03bad18a968bedf6c2 /src
parent1db615375455598fb0fbe2b7db5c658769dad3b3 (diff)
simplify #792100 workaround
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Sbuild.hs8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index 7c98782a..2c01e419 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -334,13 +334,9 @@ keypairGenerated = check (not <$> doesFileExist secKeyFile) $ go
`assume` MadeChange
-- work around Debian bug #792100 which is present in Jessie
+ -- since this is a harmless mkdir, don't actually check the OS
workAround792100 :: Property UnixLike
- workAround792100 = property' "work around #792100" $ \w -> do
- maybeOS <- getOS
- case maybeOS of
- Just (System (Debian _ (Stable "jessie")) _) ->
- ensureProperty w $ File.dirExists "/root/.gnupg"
- _ -> return NoChange
+ workAround792100 = File.dirExists "/root/.gnupg"
secKeyFile :: FilePath
secKeyFile = "/var/lib/sbuild/apt-keys/sbuild-key.sec"