diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-27 14:49:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-27 14:49:09 -0400 |
| commit | c1adde5294fe995c2d92f1ac81a2295bbbef62d4 (patch) | |
| tree | a50eb6a55220fbdc28abf1af7936d64590364756 /Command/ReKey.hs | |
| parent | 8660f3043c8968dc231727fe151063197f491a5f (diff) | |
| parent | 1cbfd6368c5b82f7559fb1f1da1209ba0c37a793 (diff) | |
finally merge the assistant into master
Progress bars still need to be done, otherwise it's fully working.
Although much work remains to hit all the use cases.
Diffstat (limited to 'Command/ReKey.hs')
| -rw-r--r-- | Command/ReKey.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/ReKey.hs b/Command/ReKey.hs index 6de7e45e3..5bd419ca3 100644 --- a/Command/ReKey.hs +++ b/Command/ReKey.hs @@ -26,7 +26,7 @@ seek = [withPairs start] start :: (FilePath, String) -> CommandStart start (file, keyname) = ifAnnexed file go stop where - newkey = fromMaybe (error "bad key") $ readKey keyname + newkey = fromMaybe (error "bad key") $ file2key keyname go (oldkey, _) | oldkey == newkey = stop | otherwise = do |