diff options
author | Joey Hess <joey@kitenet.net> | 2012-07-18 21:45:41 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-07-18 21:45:41 -0400 |
commit | 21d35f88d88676f71ad7669b9dfe398e57d7731c (patch) | |
tree | f7e4a2538d7ab0d2ff98709f241fafac4ddbc313 /Command | |
parent | 6d70002233d54445eb3e81755531d2f90e75d8f6 (diff) |
pull in transfer log code from assistant branch
New log file format.
Diffstat (limited to 'Command')
-rw-r--r-- | Command/Status.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Status.hs b/Command/Status.hs index eff21bb50..2d63c525c 100644 --- a/Command/Status.hs +++ b/Command/Status.hs @@ -186,8 +186,8 @@ transfer_list = stat "transfers in progress" $ nojson $ lift $ do [ show (transferDirection t) ++ "ing" , fromMaybe (show $ transferKey t) (associatedFile i) , if transferDirection t == Upload then "to" else "from" - , maybe (fromUUID $ transferRemote t) Remote.name $ - M.lookup (transferRemote t) uuidmap + , maybe (fromUUID $ transferUUID t) Remote.name $ + M.lookup (transferUUID t) uuidmap ] disk_size :: Stat |