summaryrefslogtreecommitdiff
path: root/KeyRing.hs
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2014-05-04 19:35:35 -0400
committerjoe <joe@jerkface.net>2014-05-04 19:35:35 -0400
commitace2d142a6824a1d73ebf8b602c495d8b91524fc (patch)
tree8351d232005b1a0abf73126afb5639374544f70b /KeyRing.hs
parent8ce5dba16886a1b19f5254e8d62810c303215387 (diff)
removed deprecated kManip field.
Diffstat (limited to 'KeyRing.hs')
-rw-r--r--KeyRing.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/KeyRing.hs b/KeyRing.hs
index 0944bd2..a96d6a2 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -366,8 +366,6 @@ data KeyRingOperation = KeyRingOperation
366 , opTransforms :: [Transform] 366 , opTransforms :: [Transform]
367 -- ^ Transformations to be performed on the key pool after all files have 367 -- ^ Transformations to be performed on the key pool after all files have
368 -- been read and before any have been written. 368 -- been read and before any have been written.
369 , kManip :: KeyRingRuntime -> KeyData -> [PacketUpdate]--[KeyRingAddress PacketUpdate]
370 -- ^ This is deprecated in favor of opTransforms (TODO: remove it)
371 , opHome :: Maybe FilePath 369 , opHome :: Maybe FilePath
372 -- ^ If provided, this is the directory where the 'HomeSec' and 'HomePub' 370 -- ^ If provided, this is the directory where the 'HomeSec' and 'HomePub'
373 -- files reside. Otherwise, the evironment variable $GNUPGHOME is consulted 371 -- files reside. Otherwise, the evironment variable $GNUPGHOME is consulted
@@ -1973,8 +1971,8 @@ interpretManip kd manip = return kd
1973combineTransforms :: KeyRingOperation -> KeyRingRuntime -> KeyData -> [PacketUpdate] 1971combineTransforms :: KeyRingOperation -> KeyRingRuntime -> KeyData -> [PacketUpdate]
1974combineTransforms operation rt kd = updates 1972combineTransforms operation rt kd = updates
1975 where 1973 where
1976 updates = kManip operation rt kd 1974 updates = -- kManip operation rt kd ++
1977 ++ concatMap (\t -> resolveTransform t rt kd) sanitized 1975 concatMap (\t -> resolveTransform t rt kd) sanitized
1978 sanitized = group (sort (opTransforms operation)) >>= take 1 1976 sanitized = group (sort (opTransforms operation)) >>= take 1
1979 1977
1980isSubkeySignature (SubkeySignature {}) = True 1978isSubkeySignature (SubkeySignature {}) = True