diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-04 11:52:43 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-04 11:52:43 -0700 |
| commit | 8638b56b36b8abf06cbb6d107a4bd058bd915437 (patch) | |
| tree | 178c0fbca935c98232c87ed83897fa45da4bde11 | |
| parent | 50986da33afb5b170a5336e4714e79130959b6c9 (diff) | |
AptPrefPackage -> AptPackagePref
This reads much better: it's an "apt package preference".
| -rw-r--r-- | src/Propellor/Property/Apt.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index d0f25e81..724f6d05 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -248,7 +248,7 @@ buildDepIn dir = cmdPropertyEnv "sh" ["-c", cmd] noninteractiveEnv -- | The name of a package, a glob to match the names of packages, or a regexp -- surrounded by slashes to match the names of packages. See -- apt_preferences(5), "Regular expressions and glob(7) syntax" -type AptPrefPackage = String +type AptPackagePref = String -- | Pins a list of packages, package wildcards and/or regular expressions to a -- list of suites and corresponding pin priorities (see apt_preferences(5)). @@ -268,7 +268,7 @@ type AptPrefPackage = String -- > & Apt.suiteAvailablePinned Unstable (-10) -- > & ["elpa-*"] `Apt.pinnedTo` [(Testing, 100), (Unstable, 50)] pinnedTo - :: [AptPrefPackage] + :: [AptPackagePref] -> [(DebianSuite, PinPriority)] -> RevertableProperty Debian Debian pinnedTo ps pins = (\p -> pinnedTo' p pins) `applyToList` ps @@ -277,7 +277,7 @@ pinnedTo ps pins = (\p -> pinnedTo' p pins) `applyToList` ps showSuites = intercalate "," $ showSuite . fst <$> pins pinnedTo' - :: AptPrefPackage + :: AptPackagePref -> [(DebianSuite, PinPriority)] -> RevertableProperty Debian Debian pinnedTo' p pins = @@ -453,7 +453,7 @@ suitePin s = prefix s ++ showSuite s prefix (Stable _) = "n=" prefix _ = "a=" -suitePinBlock :: AptPrefPackage -> DebianSuite -> PinPriority -> [Line] +suitePinBlock :: AptPackagePref -> DebianSuite -> PinPriority -> [Line] suitePinBlock p suite pin = [ "Explanation: This file added by propellor" , "Package: " ++ p |