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 /Upgrade | |
| 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 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index 31c0210c0..b2f2f38c1 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -142,7 +142,7 @@ oldlog2key l -- as the v2 key that it is. readKey1 :: String -> Key readKey1 v - | mixup = fromJust $ readKey $ join ":" $ Prelude.tail bits + | mixup = fromJust $ file2key $ join ":" $ Prelude.tail bits | otherwise = Key { keyName = n , keyBackendName = b |