summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--src/Propellor/Bootstrap.hs2
-rw-r--r--src/Propellor/Property/Bootstrap.hs3
3 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8fdfdf00..7ef4dfe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ propellor (4.0.7) UNRELEASED; urgency=medium
* Diskimage.imageExists: Align disk image size to multiple of 4096
sector size, since some programs (such as VBoxManage convertdd)
refuse to operate on disk images not aligned to a sector size.
+ * Bootstrap.bootstrappedFrom: Fix bug that caused propellor to only
+ be built from the bootstrapped config the first time.
-- Joey Hess <id@joeyh.name> Tue, 20 Jun 2017 10:55:37 -0400
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index a3b7f315..4b3f2da2 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -3,6 +3,8 @@ module Propellor.Bootstrap (
checkBinaryCommand,
installGitCommand,
buildPropellor,
+ checkDepsCommand,
+ buildCommand,
) where
import Propellor.Base
diff --git a/src/Propellor/Property/Bootstrap.hs b/src/Propellor/Property/Bootstrap.hs
index c6abe6b6..099559ad 100644
--- a/src/Propellor/Property/Bootstrap.hs
+++ b/src/Propellor/Property/Bootstrap.hs
@@ -35,7 +35,8 @@ bootstrappedFrom reposource = go `requires` clonedFrom reposource
assumeChange $ exposeTrueLocaldir $ const $
runShellCommand $ buildShellCommand
[ "cd " ++ localdir
- , bootstrapPropellorCommand system
+ , checkDepsCommand system
+ , buildCommand
]
-- | Clones the propellor repeository into /usr/local/propellor/