diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-11-11 13:03:55 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-11-11 13:04:30 -0700 |
| commit | e27641b30f7086840841e350c751410c14d789bf (patch) | |
| tree | a4a5c767858198e972fb20e1d64b55e4857a837b /src | |
| parent | 4d3595560faaa9551dcd11e1e19183983b14f37c (diff) | |
prepend user props to schroot properties
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Sbuild.hs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 62c911e3..e168d053 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -111,7 +111,7 @@ built' -> String -> String -> RevertableProperty (HasInfo + DebianLike) Linux -built' cc ps suite arch = provisioned <!> deleted +built' cc (Props ps) suite arch = provisioned <!> deleted where provisioned :: Property (HasInfo + DebianLike) provisioned = combineProperties desc $ props @@ -224,11 +224,10 @@ built' cc ps suite arch = provisioned <!> deleted -- the schroot itself schroot = Chroot.debootstrapped Debootstrap.BuilddD - schrootRoot schrootProps - -- TODO need to prepend 'ps' to this list of props - schrootProps = props - & Apt.stdSourcesList - & Apt.installed ["eatmydata", "ccache"] + schrootRoot (Props schrootProps) + schrootProps = + ps ++ [toChildProperty Apt.stdSourcesList + , toChildProperty $ Apt.installed ["eatmydata", "ccache"]] -- static values suiteArch = suite ++ "-" ++ arch |