summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Apt.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-25 17:36:52 -0400
committerJoey Hess2016-03-25 17:36:52 -0400
commit860d1dd77e1789a91ed61bdceab667d94c9bd345 (patch)
tree8ed892a54932a7887054e3a0023e0eb96088c6d3 /src/Propellor/Property/Apt.hs
parentf01776d64b1b8fcf89903d0de1ffe27f10d620ee (diff)
cleanup warnings
Diffstat (limited to 'src/Propellor/Property/Apt.hs')
-rw-r--r--src/Propellor/Property/Apt.hs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 9c3b05c4..c8ad92e4 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -81,9 +81,9 @@ securityUpdates suite
-- Since the CDN is sometimes unreliable, also adds backup lines using
-- kernel.org.
stdSourcesList :: Property Debian
-stdSourcesList = withOS "standard sources.list" $ \o os -> case os of
+stdSourcesList = withOS "standard sources.list" $ \w o -> case o of
(Just (System (Debian suite) _)) ->
- ensureProperty o $ stdSourcesListFor suite
+ ensureProperty w $ stdSourcesListFor suite
_ -> unsupportedOS
stdSourcesListFor :: DebianSuite -> Property Debian
@@ -158,10 +158,10 @@ installed' params ps = robustly $ check (isInstallable ps) go
go = runApt (params ++ ["install"] ++ ps)
installedBackport :: [Package] -> Property DebianLike
-installedBackport ps = withOS desc $ \o os -> case os of
+installedBackport ps = withOS desc $ \w o -> case o of
(Just (System (Debian suite) _)) -> case backportSuite suite of
Nothing -> unsupportedOS
- Just bs -> ensureProperty o $
+ Just bs -> ensureProperty w $
runApt (["install", "-t", bs, "-y"] ++ ps)
`changesFile` dpkgStatus
_ -> unsupportedOS
@@ -247,11 +247,11 @@ unattendedUpgrades = enable <!> disable
| otherwise = "false"
configure :: Property DebianLike
- configure = withOS "unattended upgrades configured" $ \o os ->
- case os of
+ configure = withOS "unattended upgrades configured" $ \w o ->
+ case o of
-- the package defaults to only upgrading stable
(Just (System (Debian suite) _))
- | not (isStable suite) -> ensureProperty o $
+ | not (isStable suite) -> ensureProperty w $
"/etc/apt/apt.conf.d/50unattended-upgrades"
`File.containsLine`
("Unattended-Upgrade::Origins-Pattern { \"o=Debian,a="++showSuite suite++"\"; };")