From e27641b30f7086840841e350c751410c14d789bf Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 11 Nov 2017 13:03:55 -0700 Subject: prepend user props to schroot properties --- src/Propellor/Property/Sbuild.hs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/Propellor/Property') 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 -- cgit v1.2.3