diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-08 16:06:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-08 16:20:24 -0400 |
| commit | 94fcd0cf59f94dd29ab171f0875bd25af65fd527 (patch) | |
| tree | c89328f776d3a305cc45355471ab8fa8409aa686 /Upgrade | |
| parent | e0cd9776690c74aa1b346aa11615a75c862d7714 (diff) | |
add routes to pause/start/cancel transfers
This commit includes a paydown on technical debt incurred two years ago,
when I didn't know that it was bad to make custom Read and Show instances
for types. As the routes need Read and Show for Transfer, which includes a
Key, and deriving my own Read instance of key was not practical,
I had to finally clean that up.
So the compact Key read and show functions are now file2key and key2file,
and Read and Show are now derived instances.
Changed all code that used the old instances, compiler checked.
(There were a few places, particularly in Command.Unused, and the test
suite where the Show instance continue to be used for legitimate
comparisons; ie show key_x == show key_y (though really in a bloom filter))
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 |