diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-05-07 12:16:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-07 12:16:48 -0400 |
| commit | 63ccccb1bb3eb14f351b4e8745a952d8738c0f5e (patch) | |
| tree | 5c03d545ecd6238b36bffd2951de345deba3dc57 /src/Propellor/Property/Apt.hs | |
| parent | 53a084632c3ce865877aa205580a5697440cdd8b (diff) | |
cmdProperty' renamed to cmdPropertyEnv to make way for a new, more generic cmdProperty' (API change)
Diffstat (limited to 'src/Propellor/Property/Apt.hs')
| -rw-r--r-- | src/Propellor/Property/Apt.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index 7f2ed795..81005f1a 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -109,7 +109,7 @@ setSourcesListD ls basename = f `File.hasContent` ls `onChange` update f = "/etc/apt/sources.list.d/" ++ basename ++ ".list" runApt :: [String] -> Property NoInfo -runApt ps = cmdProperty' "apt-get" ps noninteractiveEnv +runApt ps = cmdPropertyEnv "apt-get" ps noninteractiveEnv noninteractiveEnv :: [(String, String)] noninteractiveEnv = @@ -170,7 +170,7 @@ buildDep ps = robustly go buildDepIn :: FilePath -> Property NoInfo buildDepIn dir = go `requires` installedMin ["devscripts", "equivs"] where - go = cmdProperty' "sh" ["-c", "cd '" ++ dir ++ "' && mk-build-deps debian/control --install --tool 'apt-get -y --no-install-recommends' --remove"] + go = cmdPropertyEnv "sh" ["-c", "cd '" ++ dir ++ "' && mk-build-deps debian/control --install --tool 'apt-get -y --no-install-recommends' --remove"] noninteractiveEnv -- | Package installation may fail becuse the archive has changed. @@ -251,7 +251,7 @@ reConfigure package vals = reconfigure `requires` setselections forM_ vals $ \(tmpl, tmpltype, value) -> hPutStrLn h $ unwords [package, tmpl, tmpltype, value] hClose h - reconfigure = cmdProperty' "dpkg-reconfigure" ["-fnone", package] noninteractiveEnv + reconfigure = cmdPropertyEnv "dpkg-reconfigure" ["-fnone", package] noninteractiveEnv -- | Ensures that a service is installed and running. -- |