common/FileUtil.cpp | 3 ++- loleaflet/admin/src/Util.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 70201b743016fa73d02d793edae6b8974d05cc6f Author: Michael Meeks <[email protected]> AuthorDate: Tue Apr 14 22:09:54 2020 +0100 Commit: Michael Meeks <[email protected]> CommitDate: Wed Apr 15 12:31:27 2020 +0200 Log exception on recursive file removal failure. Change-Id: Ie810f23af48877bbfe9dff7da8eee709186e108e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92231 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Meeks <[email protected]> diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp index 701ab28ec..8f98a76b8 100644 --- a/common/FileUtil.cpp +++ b/common/FileUtil.cpp @@ -281,9 +281,10 @@ namespace FileUtil nftw(path.c_str(), nftw_cb, 128, FTW_DEPTH | FTW_PHYS); } } - catch (const std::exception&) + catch (const std::exception&e) { // Already removed or we don't care about failures. + LOG_DBG("Exception removing " << path << " " << recursive << " : " << e.what()); } #endif } commit 26632c2cf4839e193b3309096e319763f762a463 Author: Michael Meeks <[email protected]> AuthorDate: Tue Apr 14 22:09:14 2020 +0100 Commit: Michael Meeks <[email protected]> CommitDate: Wed Apr 15 12:31:16 2020 +0200 admin: don't allow excessive precision in humanized strings. Change-Id: Ia5e4af2618c174c5eff3696bf36c8b4fbe0a94c2 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92230 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Meeks <[email protected]> diff --git a/loleaflet/admin/src/Util.js b/loleaflet/admin/src/Util.js index 6671ed458..9d8e2b179 100644 --- a/loleaflet/admin/src/Util.js +++ b/loleaflet/admin/src/Util.js @@ -16,7 +16,7 @@ var Util = Base.extend({ kbytes /= unit; } - return kbytes + ' ' + units[i]; + return kbytes.toFixed(1) + ' ' + units[i]; }, humanizeSecs: function(secs) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
