diff options
| author | Félix Sipma <felix.sipma@no-log.org> | 2016-03-01 14:37:57 +0100 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-01 10:34:05 -0400 |
| commit | a081f34a9d4a3be1a1440fa3cf737c59d18d3a9c (patch) | |
| tree | b9012c7b434002d46e764a4e9069c1207143b459 /src | |
| parent | 3d30f34eecff5ee1c916363d18fd4a4afc57f252 (diff) | |
Apt: fix typo
(cherry picked from commit 0e076fbfaa4d57f8d665436243d20bb9e28cbebc)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Apt.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index 0a27cf9b..95f74b22 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -135,7 +135,7 @@ upgrade' p = combineProperties ("apt " ++ p) `assume` MadeChange ] --- | Have apt upgrade packages, but never add new packages or remove +-- | Have apt upgrade packages, but never add new packages or remove -- old packages. Not suitable for upgrading acrocess major versions -- of the distribution. safeUpgrade :: Property NoInfo @@ -143,7 +143,7 @@ safeUpgrade = upgrade' "upgrade" -- | Have dpkg try to configure any packages that are not fully configured. pendingConfigured :: Property NoInfo -pendingConfigured = cmdPropertyEnv "dpkg" ["--confugure", "--pending"] noninteractiveEnv +pendingConfigured = cmdPropertyEnv "dpkg" ["--configure", "--pending"] noninteractiveEnv `assume` MadeChange `describe` "dpkg configured pending" @@ -163,7 +163,7 @@ installedBackport ps = withOS desc $ \o -> case o of Nothing -> error "cannot install backports; os not declared" (Just (System (Debian suite) _)) -> case backportSuite suite of Nothing -> notsupported o - Just bs -> ensureProperty $ + Just bs -> ensureProperty $ runApt (["install", "-t", bs, "-y"] ++ ps) `changesFile` dpkgStatus _ -> notsupported o @@ -275,8 +275,8 @@ reConfigure :: Package -> [(DebconfTemplate, DebconfTemplateType, DebconfTemplat reConfigure package vals = reconfigure `requires` setselections `describe` ("reconfigure " ++ package) where - setselections = property "preseed" $ - if null vals + setselections = property "preseed" $ + if null vals then noChange else makeChange $ withHandle StdinHandle createProcessSuccess |