summaryrefslogtreecommitdiff
path: root/Upgrade
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-15 18:11:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-15 18:19:36 -0400
commit95d2391f58ae240e7100f0d5488dd7246f71f3bb (patch)
treef33f21904ae7be4d40b70bab1e2a68fd4eef5526 /Upgrade
parentb7e0d39abbc9a09c21c6f0103ad6c9f4547f81fe (diff)
more partial function removal
Left a few Prelude.head's in where it was checked not null and too hard to remove, etc.
Diffstat (limited to 'Upgrade')
-rw-r--r--Upgrade/V1.hs12
1 files changed, 6 insertions, 6 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index 567cf8e5b..80554dc3b 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -146,20 +146,20 @@ oldlog2key l =
readKey1 :: String -> Key
readKey1 v =
if mixup
- then fromJust $ readKey $ join ":" $ tail bits
+ then fromJust $ readKey $ join ":" $ Prelude.tail bits
else Key { keyName = n , keyBackendName = b, keySize = s, keyMtime = t }
where
bits = split ":" v
- b = head bits
+ b = Prelude.head bits
n = join ":" $ drop (if wormy then 3 else 1) bits
t = if wormy
- then Just (read (bits !! 1) :: EpochTime)
+ then Just (Prelude.read (bits !! 1) :: EpochTime)
else Nothing
s = if wormy
- then Just (read (bits !! 2) :: Integer)
+ then Just (Prelude.read (bits !! 2) :: Integer)
else Nothing
- wormy = head bits == "WORM"
- mixup = wormy && isUpper (head $ bits !! 1)
+ wormy = Prelude.head bits == "WORM"
+ mixup = wormy && isUpper (Prelude.head $ bits !! 1)
showKey1 :: Key -> String
showKey1 Key { keyName = n , keyBackendName = b, keySize = s, keyMtime = t } =