info: Fix "backend usage" numbers, which were counting present keys twice.

Let's just count the referenced keys for that, and not present keys at all.
This commit is contained in:
Joey Hess 2016-01-01 16:13:16 -04:00
parent 67532c7b49
commit 09a2fcb643
Failed to extract signature
2 changed files with 3 additions and 4 deletions

View file

@ -403,11 +403,8 @@ disk_size = simpleStat "available local disk space" $
backend_usage :: Stat backend_usage :: Stat
backend_usage = stat "backend usage" $ json fmt $ backend_usage = stat "backend usage" $ json fmt $
calc sort . M.toList . backendsKeys <$> cachedReferencedData
<$> (backendsKeys <$> cachedReferencedData)
<*> (backendsKeys <$> cachedPresentData)
where where
calc x y = sort $ M.toList $ M.unionWith (+) x y
fmt = multiLine . map (\(n, b) -> b ++ ": " ++ show n) . map swap fmt = multiLine . map (\(n, b) -> b ++ ": " ++ show n) . map swap
numcopies_stats :: Stat numcopies_stats :: Stat

2
debian/changelog vendored
View file

@ -33,6 +33,8 @@ git-annex (6.20151219) UNRELEASED; urgency=medium
* Debian: Adjust build dependencies for webapp, DAV. Now available on * Debian: Adjust build dependencies for webapp, DAV. Now available on
mips, mipsel, but temporarily removed armel since build is failing mips, mipsel, but temporarily removed armel since build is failing
there. there.
* info: Fix "backend usage" numbers, which were counting present keys
twice.
-- Joey Hess <id@joeyh.name> Sat, 19 Dec 2015 13:31:17 -0400 -- Joey Hess <id@joeyh.name> Sat, 19 Dec 2015 13:31:17 -0400