From 15ab46fd528b6fe697910e9ff616f5fa7f7d2c84 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 29 Apr 2015 14:28:09 -0400 Subject: propellor spin --- src/Propellor/Bootstrap.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Bootstrap.hs') diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index a07347ed..3c28edf0 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -77,7 +77,8 @@ depsCommand = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall]) ++ " , "libghc-network-dev" , "libghc-quickcheck2-dev" , "libghc-mtl-dev" - , "libghc-monadcatchio-transformers-dev" + , "libghc-transformers-dev" + , "libghc-exceptions-dev" ] installGitCommand :: ShellCommand -- cgit v1.3-2-g0d8e From a5842683349d6d5f41c46414e1721253f5b4779e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 29 Apr 2015 14:31:54 -0400 Subject: Ensure build deps are installed before building propellor in --spin and cron job, even if propellor was already built before, to deal with upgrades that add new dependencies. --- debian/changelog | 3 +++ src/Propellor/Bootstrap.hs | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/Propellor/Bootstrap.hs') diff --git a/debian/changelog b/debian/changelog index 592c75a7..5c166f0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ propellor (2.4.0) UNRELEASED; urgency=medium * Merged Utility changes from git-annex. * Switched from MonadCatchIO-transformers to the newer transformers and exceptions libraries. + * Ensure build deps are installed before building propellor in --spin + and cron job, even if propellor was already built before, to deal with + upgrades that add new dependencies. -- Joey Hess Wed, 22 Apr 2015 20:59:59 -0400 diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 3c28edf0..260d8117 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -17,12 +17,10 @@ type ShellCommand = String -- Should be run inside the propellor config dir, and will install -- all necessary build dependencies and build propellor. bootstrapPropellorCommand :: ShellCommand -bootstrapPropellorCommand = "if ! test -x ./propellor; then " ++ go ++ "; fi;" ++ checkBinaryCommand - where - go = intercalate " && " - [ depsCommand - , buildCommand - ] +bootstrapPropellorCommand = depsCommand ++ + "&& if ! test -x ./propellor; then " + ++ buildCommand ++ + "; fi;" ++ checkBinaryCommand -- Use propellor --check to detect if the local propellor binary has -- stopped working (eg due to library changes), and must be rebuilt. -- cgit v1.3-2-g0d8e From 6288393b4b5e413b2634b0ea59cbc8713061d5cd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 29 Apr 2015 14:41:46 -0400 Subject: avoid checking build deps if cabal configures ok --- src/Propellor/Bootstrap.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Bootstrap.hs') diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 260d8117..51ba69a4 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -17,7 +17,7 @@ type ShellCommand = String -- Should be run inside the propellor config dir, and will install -- all necessary build dependencies and build propellor. bootstrapPropellorCommand :: ShellCommand -bootstrapPropellorCommand = depsCommand ++ +bootstrapPropellorCommand = checkDepsCommand ++ "&& if ! test -x ./propellor; then " ++ buildCommand ++ "; fi;" ++ checkBinaryCommand @@ -39,6 +39,11 @@ buildCommand = intercalate " && " , "ln -sf dist/build/propellor-config/propellor-config propellor" ] +-- Run cabal configure to check if all dependencies are installed; +-- if not, run the depsCommand. +checkDepsCommand :: ShellCommand +checkDepsCommand = "if ! cabal configure >/dev/null 2>&1; then " ++ depsCommand ++ "; fi" + -- Install build dependencies of propellor. -- -- First, try to install ghc, cabal, gnupg, and all haskell libraries that -- cgit v1.3-2-g0d8e