diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-21 19:47:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-21 19:47:00 -0400 |
| commit | 85f08ee913a77c16ba4d264581b1240468c4ebb2 (patch) | |
| tree | 3efb26e19590f1892704ed0fdc44e7a34b391bfd /src/Propellor/Property/Conductor.hs | |
| parent | a35c50d2cdc0bc6fe6f7cc49103d6e94ea406839 (diff) | |
fix build warnings
Diffstat (limited to 'src/Propellor/Property/Conductor.hs')
| -rw-r--r-- | src/Propellor/Property/Conductor.hs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Propellor/Property/Conductor.hs b/src/Propellor/Property/Conductor.hs index ca69abb5..ed46601d 100644 --- a/src/Propellor/Property/Conductor.hs +++ b/src/Propellor/Property/Conductor.hs @@ -73,7 +73,7 @@ module Propellor.Property.Conductor ( Conductable(..), ) where -import Propellor.Base +import Propellor.Base hiding (os) import Propellor.Spin (spin') import Propellor.PrivData.Paths import Propellor.Types.Info @@ -142,12 +142,12 @@ combineOrchestras' (Conducted h) b | sameHost h (topHost b) = Just b | otherwise = Nothing combineOrchestras' (Conductor h os) (Conductor h' os') - | sameHost h h' = Just $ Conductor h (concatMap (combineos os) os') + | sameHost h h' = Just $ Conductor h (concatMap combineos os') where - combineos os o = case mapMaybe (`combineOrchestras` o) os of + combineos o = case mapMaybe (`combineOrchestras` o) os of [] -> [o] - os' -> os' -combineOrchestras' a@(Conductor h os) (Conducted h') + os'' -> os'' +combineOrchestras' a@(Conductor h _) (Conducted h') | sameHost h h' = Just a combineOrchestras' (Conductor h os) b | null (catMaybes (map snd osgrafts)) = Nothing @@ -164,7 +164,7 @@ sameHost a b = hostName a == hostName b -- one seen. deloop :: Host -> Orchestra -> Orchestra deloop _ (Conducted h) = Conducted h -deloop thehost c@(Conductor htop ostop) = Conductor htop $ +deloop thehost (Conductor htop ostop) = Conductor htop $ fst $ seekh [] ostop (sameHost htop thehost) where seekh l [] seen = (l, seen) @@ -287,7 +287,7 @@ addConductorPrivData h hs = h { hostInfo = hostInfo h <> i } i = mempty `addInfo` mconcat (map privinfo hs) `addInfo` Orchestrated (Any True) - privinfo h = forceHostContext (hostName h) $ getInfo (hostInfo h) + privinfo h' = forceHostContext (hostName h') $ getInfo (hostInfo h') -- Use this property to let the specified conductor ssh in and run propellor. conductedBy :: Host -> RevertableProperty |