summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2016-04-29 21:54:41 -0400
committerjoe <joe@jerkface.net>2016-04-29 21:54:41 -0400
commitc2cf1002fa6f48cc699f6c5925272a2ddb28bd64 (patch)
treece77b6f3b32b304e1b0f65670b547bb4e463c244
parent20d17eef898d342ef62812d2b74b590e73cc1180 (diff)
build fixes
-rw-r--r--kiki.cabal5
-rw-r--r--lib/KeyRing.hs2
2 files changed, 1 insertions, 6 deletions
diff --git a/kiki.cabal b/kiki.cabal
index ff424eb..62b9fd3 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -26,10 +26,6 @@ Flag needlocale
26Flag unixEnv 26Flag unixEnv
27 Default: False 27 Default: False
28 28
29Executable xx
30 Main-is: xx.hs
31 Build-Depends: base, kiki
32
33Executable kiki 29Executable kiki
34 Main-is: kiki.hs 30 Main-is: kiki.hs
35 -- base >=4.6 due to use of readEither in KikiD.Message 31 -- base >=4.6 due to use of readEither in KikiD.Message
@@ -107,7 +103,6 @@ library
107 containers, 103 containers,
108 dataenc, 104 dataenc,
109 directory, 105 directory,
110 extra,
111 filepath, 106 filepath,
112 network, 107 network,
113 openpgp-util, 108 openpgp-util,
diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 1f193b3..77d6973 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -1068,7 +1068,7 @@ parseSpec3 maybeExpecting spec@(wordsBy '/' -> fields) =
1068 valid :: SingleKeySpec -> Int -> Bool 1068 valid :: SingleKeySpec -> Int -> Bool
1069 valid spec dflt = ("tuc"::String) !! gotIndex dflt spec `notElem` forbidden (gotIndex dflt spec) 1069 valid spec dflt = ("tuc"::String) !! gotIndex dflt spec `notElem` forbidden (gotIndex dflt spec)
1070 where 1070 where
1071 forbidden 0 = "uc" 1071 forbidden 0 = "uc" :: [Char]
1072 forbidden 1 = "tc" 1072 forbidden 1 = "tc"
1073 forbidden 2 = "tu" 1073 forbidden 2 = "tu"
1074 1074