diff options
Diffstat (limited to 'KeyRing.hs')
-rw-r--r-- | KeyRing.hs | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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 | |||
1973 | combineTransforms :: KeyRingOperation -> KeyRingRuntime -> KeyData -> [PacketUpdate] | 1971 | combineTransforms :: KeyRingOperation -> KeyRingRuntime -> KeyData -> [PacketUpdate] |
1974 | combineTransforms operation rt kd = updates | 1972 | combineTransforms 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 | ||
1980 | isSubkeySignature (SubkeySignature {}) = True | 1978 | isSubkeySignature (SubkeySignature {}) = True |