diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/Propellor/Property/Restic.hs | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index e41a58f8..517ef350 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +propellor (5.3.7) UNRELEASED; urgency=medium + + * Restic.installed: stop trying to install a backport on jessie, because no + such backport exists. + + -- Sean Whitton <spwhitton@spwhitton.name> Thu, 17 May 2018 00:12:42 -0700 + propellor (5.3.6) unstable; urgency=medium * Fix build with ghc 8.4, which broke due to the Semigroup Monoid change. diff --git a/src/Propellor/Property/Restic.hs b/src/Propellor/Property/Restic.hs index 9415f4bf..01b56510 100644 --- a/src/Propellor/Property/Restic.hs +++ b/src/Propellor/Property/Restic.hs @@ -35,13 +35,7 @@ instance ConfigurableValue ResticRepo where val (REST url) = "rest:" ++ url installed :: Property DebianLike -installed = withOS desc $ \w o -> case o of - (Just (System (Debian _ (Stable "jessie")) _)) -> ensureProperty w $ - Apt.installedBackport ["restic"] - _ -> ensureProperty w $ - Apt.installed ["restic"] - where - desc = "installed restic" +installed = Apt.installed ["restic"] `describe` "installed restic" repoExists :: ResticRepo -> IO Bool repoExists repo = boolSystem "restic" |