diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:48:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-24 15:01:55 -0400 |
| commit | 42e08cd4575d3dc558dfe172c1f28c752d69e8c6 (patch) | |
| tree | 78a8eddc31c390aaf8f66435bb13db9366f9a7c4 /Command/Dead.hs | |
| parent | 34f375526f44ff255d45bbabcd1425b3d5d0bb4a (diff) | |
| parent | 3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (diff) | |
Merge branch 'master' into no-xmpp
Diffstat (limited to 'Command/Dead.hs')
| -rw-r--r-- | Command/Dead.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Dead.hs b/Command/Dead.hs index ecbe41293..44cf7b7f6 100644 --- a/Command/Dead.hs +++ b/Command/Dead.hs @@ -37,7 +37,7 @@ startKey key = do ls <- keyLocations key case ls of [] -> next $ performKey key - _ -> error "This key is still known to be present in some locations; not marking as dead." + _ -> giveup "This key is still known to be present in some locations; not marking as dead." performKey :: Key -> CommandPerform performKey key = do |