summaryrefslogtreecommitdiff
path: root/src/Propellor/Types
diff options
context:
space:
mode:
authorJoey Hess2020-05-01 15:21:05 -0400
committerJoey Hess2020-05-01 15:21:05 -0400
commit7859c8c02b422229fbcbc5c26dad378fca5c9e88 (patch)
treea1037135f35e1dd934fb8ab2462f011bf9d282e1 /src/Propellor/Types
parentdc3a04ae10addd701cc5cce59b2ad8931fa656ba (diff)
parentcc3289f70f09d2fa061cc21e47ea44d4b374dadd (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Types')
-rw-r--r--src/Propellor/Types/Core.hs3
-rw-r--r--src/Propellor/Types/Info.hs1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/Propellor/Types/Core.hs b/src/Propellor/Types/Core.hs
index 88c749b3..9f4dc519 100644
--- a/src/Propellor/Types/Core.hs
+++ b/src/Propellor/Types/Core.hs
@@ -109,3 +109,6 @@ instance IsProp ChildProperty where
getInfo (ChildProperty _ _ i _) = i
toChildProperty = id
getSatisfy (ChildProperty _ a _ _) = a
+
+propsInfo :: Props metatypes -> Info
+propsInfo (Props l) = mconcat (map getInfo l)
diff --git a/src/Propellor/Types/Info.hs b/src/Propellor/Types/Info.hs
index b941cc8f..27633712 100644
--- a/src/Propellor/Types/Info.hs
+++ b/src/Propellor/Types/Info.hs
@@ -63,6 +63,7 @@ addInfo (Info l) v = Info (l++[InfoEntry v])
toInfo :: IsInfo v => v -> Info
toInfo = addInfo mempty
+-- | Extracts a value from an Info.
fromInfo :: IsInfo v => Info -> v
fromInfo (Info l) = mconcat (mapMaybe extractInfoEntry l)