From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yACuFYMYzGOmKwAAbAwnHQ (envelope-from ) for ; Sat, 21 Jan 2023 17:53:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id cAV/FYMYzGNSYQAAauVa8A (envelope-from ) for ; Sat, 21 Jan 2023 17:53:23 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1E06E10D1D for ; Sat, 21 Jan 2023 17:53:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJH76-0001V3-9I; Sat, 21 Jan 2023 11:53:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pJH70-0001UW-PF for bug-guix@gnu.org; Sat, 21 Jan 2023 11:53:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJH70-00026Z-GV for bug-guix@gnu.org; Sat, 21 Jan 2023 11:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJH6z-0000BS-Mv for bug-guix@gnu.org; Sat, 21 Jan 2023 11:53:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#58880: 'guix gc' does not round the amount of disk space freed Resent-From: Remco van 't Veer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 21 Jan 2023 16:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58880 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch easy To: zimoun Cc: 58880@debbugs.gnu.org, Julien Lepiller Received: via spool by 58880-submit@debbugs.gnu.org id=B58880.1674319934648 (code B ref 58880); Sat, 21 Jan 2023 16:53:01 +0000 Received: (at 58880) by debbugs.gnu.org; 21 Jan 2023 16:52:14 +0000 Received: from localhost ([127.0.0.1]:49668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJH6E-0000AN-AM for submit@debbugs.gnu.org; Sat, 21 Jan 2023 11:52:14 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:40789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJH6B-0000A7-VW for 58880@debbugs.gnu.org; Sat, 21 Jan 2023 11:52:12 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 278BF3200754; Sat, 21 Jan 2023 11:52:05 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 21 Jan 2023 11:52:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=remworks.net; h= cc:cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1674319924; x=1674406324; bh=PBT+JVsz2D HC8U/HgBrczDsYSkFa+4fo4nW1zLtQehE=; b=GpNgFVtx1y06B6Orx9pD8E7ptT gcdf6GvbYvxQiOkfgBr+2FuOchp8Gct8gXHG70lExWsQfNiz2s3USx4+hO7GGXav eoOt9uZHPR8qpftwdYHo961601IAbZKi9C7u3zshC9/uvNqm+3a8QHkkicyaT+dK ceepGWlbEGRGqi5rqU1na3qhF5DXwJdfHvp6JEIYrPTKZ+i8bBjx9DAIwmcU4bco zE5G9Jfg/iINIWwzCxhaCutjj5gchyDcbJbTo9pSgvEXfRNkNKlO/an1uGhQvDFB vNWjQXQQt03X2L8qPUPd2a2i3y/4ex9ttBtoG0zCUm5DfHr9QdHq0jVIV/OA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1674319924; x=1674406324; bh=PBT+JVsz2DHC8U/HgBrczDsYSkFa +4fo4nW1zLtQehE=; b=NzQYE4xft6hVdsAa5syAmTLd3PCtq0cL3gWq6aJzcB6i 1t3pYRn4O3PC58LeisGO/UkZW96njg5PwMtCPrmwQJMzMA8hu5P+75wHgrfYtJUz /K/ohDZpaYhYUIaxgkEHWIG0iXOavZjJN0cMWsTGXSg0n0N1xVO5iQykYYmBt5MQ 2vOZv38DN0/eeXWKqu0Auv4woLNRLvQ+mbOdYPRGVnCPdWtkLmTtQpqN7YOQwAWg 6leZCMk6/zFyiV1B9JR4XtG/rCa/J/uvWnGt3lXk4Au4rDjCATl7OwsE73v0U/vH tpqJt0l8oQmybaPZdILyDdy3q8Ls/w+ynHSd+1N92w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedruddugedgjeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfhgfhffvvefujgffkfggtgesthdtredttdertdenucfhrhhomheptfgvmhgt ohcuvhgrnhcukdhtucggvggvrhcuoehrvghmtghosehrvghmfihorhhkshdrnhgvtheqne cuggftrfgrthhtvghrnhepkeduveegfedufeelhedvuedvhfeufedtteevkeehhfeigfev lefhgeeukedtfeevnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomheprhgvmhgtohesrhgvmhifohhrkhhsrdhnvght X-ME-Proxy: Feedback-ID: i568842cc:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 21 Jan 2023 11:52:03 -0500 (EST) References: <5z3zneF8G6Y-8ua-MISE2H5Kth7yWekIe_gGm8a9F35IewpTkm_rscQL5eIP0tKeUJM7LGsNWlELU0DON2pYG5EfMkQoyXM5cA8NRVZRy8k=@proton.me> <20221125203328.21379-1-remco@remworks.net> <86zgab26ru.fsf_-_@gmail.com> User-agent: mu4e 1.8.13; emacs 28.2 From: Remco van 't Veer In-reply-to: <86zgab26ru.fsf_-_@gmail.com> Date: Sat, 21 Jan 2023 17:52:01 +0100 Message-ID: <87mt6bkez2.fsf@remworks.net> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674320003; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=PBT+JVsz2DHC8U/HgBrczDsYSkFa+4fo4nW1zLtQehE=; b=pWOPOWxXB7KwvtQKUMOoPYvnSovLbOVZ9RzDxFvWJMtQleKjHRDZPxISSvVt/gK3+2xThO E7/ivYAzaBXnMROKbSv2PDvnSD1orJVGWkQ3HvpTgFAEp+5DqyV7twHXv68YerHdZMuqNQ Z+Rl7nom3R2srH4EYvKiUHNCmGhoV/qrn2vQ/qYTLcxWicUGkql3+bhVsGDy8O8vNKG468 RdJyCKuNZJsNzLwWmZBQRvB1LfTcUD8pqpCH6/aS2csPHNjg+3JcW1zk+h4FPjcTrL+D0H FHjOXPeY+ivj12zF7Oto4/cPKVeMRa9anqBnbYIDmxh6Wy2AJG7EvGzlt0i9+A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=remworks.net header.s=fm2 header.b=GpNgFVtx; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b=NzQYE4xf; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674320003; a=rsa-sha256; cv=none; b=bIbP7I5YA2riNrzT5z4zdY7JvRVSULtmltrmjZMoIXDOYFswew4r0z/i5baB0z26J6qnMw D3Iuwx5Gl3d1lqbUmQBgY0p8NTxO/LrL6CCcMW0QbRP7ZFgEgncy5zUxGG15dwys3gFOdf 8xZsme4XfLFr6uKJRK0NW2dl73+EXNA5HBLmB8IA4asih896ktABjDQadOy13uCky0g+3H InueOu2moHkrL7o2W2zxk89T67Gts1SiPYpi4ocFdhyBPEIv+FIMQB0Hwv5PHvhfxdJK2B RKnDATzlEqCaBbKR6iaIvXYnDSUdYucUJAZa0tRHC99x+X+mB6GGWoknTUdgxg== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 2.30 X-Spam-Score: 2.30 X-Migadu-Queue-Id: 1E06E10D1D Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=remworks.net header.s=fm2 header.b=GpNgFVtx; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b=NzQYE4xf; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-TUID: 9Mhdv/Vk8aix Hi, 2023/01/21 17:26, zimoun: > On Fri, 25 Nov 2022 at 21:33, Remco van 't Veer wrote: >> * guix/scripts/gc.scm (guix-gc): Round MiBs in user feedback. >> * po/*/*.po (guix/scripts/gc.scm)a: Round MiBs in user feedback. > > If the way to go with the translation dance? I don't know. I figured since the translation key was changed this would be the best way to do this but to be honest I don't understand how to do this using "weblate" (from info:guix#Translating Guix). > The only change is: > >> diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm >> index 5e775c5cdb..2bbfb26d5d 100644 >> --- a/guix/scripts/gc.scm >> +++ b/guix/scripts/gc.scm >> @@ -260,10 +260,10 @@ (define-command (guix-gc . args) >> ;; Attempt to have at least SPACE bytes available in STORE. >> (let ((free (free-disk-space (%store-prefix)))) >> (if (> free space) >> - (info (G_ "already ~h MiBs available on ~a, nothing to do~%") >> + (info (G_ "already ~,2h MiBs available on ~a, nothing to do~%") >> (/ free 1024. 1024.) (%store-prefix)) >> (let ((to-free (- space free))) >> - (info (G_ "freeing ~h MiBs~%") (/ to-free 1024. 1024.)) >> + (info (G_ "freeing ~,2h MiBs~%") (/ to-free 1024. 1024.)) >> (collect-garbage store to-free))))) >> >> (define (delete-generations store pattern) >> @@ -327,10 +327,10 @@ (define-command (guix-gc . args) >> (ensure-free-space store free-space)) >> (min-freed >> (let-values (((paths freed) (collect-garbage store min-freed))) >> - (info (G_ "freed ~h MiBs~%") (/ freed 1024. 1024.)))) >> + (info (G_ "freed ~,2h MiBs~%") (/ freed 1024. 1024.)))) >> (else >> (let-values (((paths freed) (collect-garbage store))) >> - (info (G_ "freed ~h MiBs~%") (/ freed 1024. 1024.))))))) >> + (info (G_ "freed ~,2h MiBs~%") (/ freed 1024. 1024.))))))) >> ((list-roots) >> (assert-no-extra-arguments) >> (list-roots)) > > and captured by G_ so does this only to be applied and then all the > msgid updated by the translation process? Yes, this is the only change. The old keys will be orphaned though and remain in the po files. I'd be happy to drop the po/*/*.po part of the patch if that helps. Cheers, Remco