diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-01-03 16:26:16 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-03 16:26:16 -0400 |
| commit | 3f5cc046915a9f64c31a6d48aaef5254f5eb7598 (patch) | |
| tree | 110bd5acac6adf0c08111efb9f9cd2dc07701b30 /src/Propellor/Bootstrap.hs | |
| parent | 299d478dfd96037c660109c4f0519fd1cc37a887 (diff) | |
| parent | 93ee9e6966783368fa41fb75c7e287bee04f9c16 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Bootstrap.hs')
| -rw-r--r-- | src/Propellor/Bootstrap.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index f2f5af55..c49cb5af 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -63,7 +63,7 @@ depsCommand = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall]) ++ " , "cabal install --only-dependencies" ] - aptinstall p = "apt-get --no-upgrade --no-install-recommends -y install " ++ p + aptinstall p = "DEBIAN_FRONTEND=noninteractive apt-get --no-upgrade --no-install-recommends -y install " ++ p -- This is the same deps listed in debian/control. debdeps = @@ -86,7 +86,7 @@ depsCommand = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall]) ++ " ] installGitCommand :: ShellCommand -installGitCommand = "if ! git --version >/dev/null; then apt-get update && apt-get --no-install-recommends --no-upgrade -y install git; fi" +installGitCommand = "if ! git --version >/dev/null; then apt-get update && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends --no-upgrade -y install git; fi" buildPropellor :: IO () buildPropellor = unlessM (actionMessage "Propellor build" build) $ |