diff options
| author | Joe Crayne <joe@jerkface.net> | 2019-07-04 14:35:33 -0400 |
|---|---|---|
| committer | Joe Crayne <joe@jerkface.net> | 2019-07-04 14:35:33 -0400 |
| commit | d0030addd10a5e227ddd82256bdcdb0f5e3811ac (patch) | |
| tree | 18d148afcf8d6eb550ffc0652d12301e58fe7f65 /lib/KeyRing | |
| parent | c472c2e386e8a748022e3bfbda0a2886f9759999 (diff) | |
Added --show-key=SPEC command to low-level merge api.
Diffstat (limited to 'lib/KeyRing')
| -rw-r--r-- | lib/KeyRing/BuildKeyDB.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs index 8e54127..10e2d41 100644 --- a/lib/KeyRing/BuildKeyDB.hs +++ b/lib/KeyRing/BuildKeyDB.hs | |||
| @@ -324,7 +324,7 @@ readPacketsFromFile ctx fname = do | |||
| 324 | Right (more,_,pkt) -> (,) BinaryPackets $ Message $ pkt : decodePacketList more | 324 | Right (more,_,pkt) -> (,) BinaryPackets $ Message $ pkt : decodePacketList more |
| 325 | Left (_,_,_) -> case ASCIIArmor.decodeLazy input of | 325 | Left (_,_,_) -> case ASCIIArmor.decodeLazy input of |
| 326 | Right (Armor pubOrSec headers bs:_) -> (,) AsciiArmor $ Message $ decodePacketList bs | 326 | Right (Armor pubOrSec headers bs:_) -> (,) AsciiArmor $ Message $ decodePacketList bs |
| 327 | Left errmsg -> (,) DetectAscii $ Message [] | 327 | _ -> (,) DetectAscii $ Message [] |
| 328 | 328 | ||
| 329 | readPacketsFromWallet :: | 329 | readPacketsFromWallet :: |
| 330 | Maybe Packet | 330 | Maybe Packet |