diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-01-30 18:38:39 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-01-30 18:38:39 -0700 |
| commit | 77c1f36116b1e3a6c2d3936504dfdd7e8bdb5241 (patch) | |
| tree | 1c9cc9c4f5ed4ed1ea766ff8fd8f200e10396f2d /src | |
| parent | e5a581fee717b770600767d59f6edf812967eaf2 (diff) | |
refactor to fix type errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Apt.hs | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index 0990c83b..56b42eb6 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -108,28 +108,37 @@ type PinPriority = Int -- If the requested suite is the host's OS suite, the suite is pinned, but no -- source is added. That apt source should already be available, or you can use -- a property like 'Apt.stdSourcesList'. -suiteAvailablePinned :: DebianSuite -> PinPriority -> RevertableProperty Debian +suiteAvailablePinned + :: DebianSuite + -> PinPriority + -> RevertableProperty Debian Debian suiteAvailablePinned s pin = available <!> unavailable - `onChange` update where - available = combineProperties (desc True) $ props + available :: Property Debian + available = tightenTargets $ combineProperties (desc True) $ props & File.hasContent prefFile [ "Package: *" , "Pin: release " ++ suitePin s , "Pin-Priority: " ++ show pin ] - & withOS (desc True) $ \w o -> case o of - (Just (System (Debian _ hostSuite) _)) -> - | s /= hostSuite = ensureProperty w $ - File.hasContent sourceFile - (concatMap (\gen -> gen s) generators) - | otherwise = doNothing - _ -> doNothing + & setSourceFile - unavailable = combineProperties (desc False) $ props + unavailable :: Property Debian + unavailable = tightenTargets $ combineProperties (desc False) $ props & File.notPresent sourceFile + `onChange` update & File.notPresent prefFile + setSourceFile :: Property Debian + setSourceFile = withOS (desc True) $ \w o -> case o of + (Just (System (Debian _ hostSuite) _)) + | s /= hostSuite -> ensureProperty w $ + File.hasContent + sourceFile + (concatMap (\gen -> gen s) generators) + `onChange` update + _ -> noChange + generators = [debCdn, kernelOrg, securityUpdates] sourceFile = "/etc/apt/preferences.d/20" ++ showSuite s ++ ".pref" prefFile = "/etc/apt/sources.list.d/" ++ showSuite s ++ ".list" @@ -244,7 +253,7 @@ buildDepIn dir = cmdPropertyEnv "sh" ["-c", cmd] noninteractiveEnv -- -- > & Apt.suiteAvailablePinned Unstable -- > & ["elpa-*"] `Apt.pinnedTo` Unstable 990 -pinnedTo :: [String] -> DebianSuite -> PinPriority -> RevertableProperty Debian +pinnedTo :: [String] -> DebianSuite -> PinPriority -> RevertableProperty Debian Debian pinnedTo = undefined -- | Package installation may fail becuse the archive has changed. |