diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-19 19:51:24 +0900 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-19 19:52:14 +0900 |
| commit | 9b50bf8f052c1fe48af1b48c023faa1c1f2fb273 (patch) | |
| tree | 625377a8866c9d8f362b2c19561850d60683e7dd /src | |
| parent | a48c09f560ffa3eee0ef14bcc54190ee41c111c1 (diff) | |
further simplify #792100 workaround
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Sbuild.hs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 63b76bdf..1c1b45b3 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -328,18 +328,15 @@ usableBy u = User.hasGroup u (Group "sbuild") `requires` installed keypairGenerated :: Property DebianLike keypairGenerated = check (not <$> doesFileExist secKeyFile) $ go `requires` installed - `requires` workAround792100 + -- Work around Debian bug #792100 which is present in Jessie. + -- Since this is a harmless mkdir, don't actually check the OS + `requires` File.dirExists "/root/.gnupg" where go :: Property DebianLike go = tightenTargets $ cmdProperty "sbuild-update" ["--keygen"] `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 = File.dirExists "/root/.gnupg" - secKeyFile :: FilePath secKeyFile = "/var/lib/sbuild/apt-keys/sbuild-key.sec" |