From 874f2d0614639aaef6ac146f9878574ba855a90b Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 19 Jun 2016 19:18:50 +0900 Subject: simplify #792100 workaround --- src/Propellor/Property/Sbuild.hs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/Propellor/Property/Sbuild.hs') 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" -- cgit v1.2.3