summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Obnam.hs
diff options
context:
space:
mode:
authorJoey Hess2014-10-10 11:36:47 -0400
committerJoey Hess2014-10-10 11:36:47 -0400
commit07f745ef9ca23982d7ef7e89bd6a638077a65ded (patch)
tree9acc6ddda92f98d4c951045d4dcf406207c809ba /src/Propellor/Property/Obnam.hs
parent2028464268c9e4696c59ee6626a9e315c88ad935 (diff)
parent31f84270fddbf07221a6c1ea30e7a8c05db29115 (diff)
Merge branch 'joeyconfig'
Conflicts: debian/changelog privdata/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/Obnam.hs')
-rw-r--r--src/Propellor/Property/Obnam.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/Obnam.hs b/src/Propellor/Property/Obnam.hs
index b5c6d776..1e7c2c25 100644
--- a/src/Propellor/Property/Obnam.hs
+++ b/src/Propellor/Property/Obnam.hs
@@ -105,12 +105,12 @@ installed = Apt.installed ["obnam"]
latestVersion :: Property
latestVersion = withOS "obnam latest version" $ \o -> case o of
(Just (System (Debian suite) _)) | isStable suite -> ensureProperty $
- Apt.setSourcesListD stablesources "obnam"
+ Apt.setSourcesListD (stablesources suite) "obnam"
`requires` toProp (Apt.trustsKey key)
_ -> noChange
where
- stablesources =
- [ "deb http://code.liw.fi/debian " ++ Apt.showSuite stableRelease ++ " main"
+ stablesources suite =
+ [ "deb http://code.liw.fi/debian " ++ Apt.showSuite suite ++ " main"
]
-- gpg key used by the code.liw.fi repository.
key = Apt.AptKey "obnam" $ unlines