summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Obnam.hs
diff options
context:
space:
mode:
authorJoey Hess2014-10-10 11:27:54 -0400
committerJoey Hess2014-10-10 11:27:54 -0400
commit79ee61d958cdea43aec9ce7e63cbe88254641472 (patch)
tree3e37882a29c8b6ff7637533153456bec0737a662 /src/Propellor/Property/Obnam.hs
parent1e22e178b4080e70efc262e42943e615abfdb3b9 (diff)
stable suite changes
* Avoid encoding the current stable suite in propellor's code, since that poses a difficult transition around the release, and can easily be wrong if an older version of propellor is used. Instead, the os property for a stable system includes the suite name to use, eg Stable "wheezy". * stdSourcesList uses the stable suite name, to avoid unwanted immediate upgrades to the next stable release.
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