From 3d30f34eecff5ee1c916363d18fd4a4afc57f252 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Feb 2016 18:17:02 -0400 Subject: run dpkg --configure with non-interactive env --- src/Propellor/Property/Apt.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index d05bdcb9..0a27cf9b 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -143,7 +143,7 @@ safeUpgrade = upgrade' "upgrade" -- | Have dpkg try to configure any packages that are not fully configured. pendingConfigured :: Property NoInfo -pendingConfigured = cmdProperty "dpkg" ["--confugure", "--pending"] +pendingConfigured = cmdPropertyEnv "dpkg" ["--confugure", "--pending"] noninteractiveEnv `assume` MadeChange `describe` "dpkg configured pending" -- cgit v1.2.3 From a081f34a9d4a3be1a1440fa3cf737c59d18d3a9c Mon Sep 17 00:00:00 2001 From: Félix Sipma Date: Tue, 1 Mar 2016 14:37:57 +0100 Subject: Apt: fix typo (cherry picked from commit 0e076fbfaa4d57f8d665436243d20bb9e28cbebc) --- src/Propellor/Property/Apt.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Propellor') 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 -- cgit v1.2.3 From 458e74ec9b4fa4e16e3484a972c331d20c29ffa6 Mon Sep 17 00:00:00 2001 From: Félix Sipma Date: Tue, 1 Mar 2016 14:39:19 +0100 Subject: Apt: hlint fixes (cherry picked from commit 3682285c696ff24169f2bdaad6fbbea6a561b560) --- src/Propellor/Property/Apt.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index 95f74b22..eae56ab5 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -154,7 +154,7 @@ installed = installed' ["-y"] installed' :: [String] -> [Package] -> Property NoInfo installed' params ps = robustly $ check (isInstallable ps) go - `describe` (unwords $ "apt installed":ps) + `describe` unwords ("apt installed":ps) where go = runApt (params ++ ["install"] ++ ps) @@ -168,7 +168,7 @@ installedBackport ps = withOS desc $ \o -> case o of `changesFile` dpkgStatus _ -> notsupported o where - desc = (unwords $ "apt installed backport":ps) + desc = unwords ("apt installed backport":ps) notsupported o = error $ "backports not supported on " ++ show o -- | Minimal install of package, without recommends. @@ -177,12 +177,12 @@ installedMin = installed' ["--no-install-recommends", "-y"] removed :: [Package] -> Property NoInfo removed ps = check (or <$> isInstalled' ps) (runApt (["-y", "remove"] ++ ps)) - `describe` (unwords $ "apt removed":ps) + `describe` unwords ("apt removed":ps) buildDep :: [Package] -> Property NoInfo buildDep ps = robustly $ go `changesFile` dpkgStatus - `describe` (unwords $ "apt build-dep":ps) + `describe` unwords ("apt build-dep":ps) where go = runApt $ ["-y", "build-dep"] ++ ps @@ -331,7 +331,7 @@ hasForeignArch :: String -> Property NoInfo hasForeignArch arch = check notAdded (add `before` update) `describe` ("dpkg has foreign architecture " ++ arch) where - notAdded = (not . elem arch . lines) <$> readProcess "dpkg" ["--print-foreign-architectures"] + notAdded = (notElem arch . lines) <$> readProcess "dpkg" ["--print-foreign-architectures"] add = cmdProperty "dpkg" ["--add-architecture", arch] `assume` MadeChange -- cgit v1.2.3