From mboxrd@z Thu Jan 1 00:00:00 1970 From: iyzsong@member.fsf.org (=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?=) Subject: bug#28756: Substitute download progress bar doesn't reach 100% Date: Sat, 14 Oct 2017 23:05:15 +0800 Message-ID: <87y3od93dg.fsf@member.fsf.org> References: <20171009035203.GA8019@jasmine.lan> <87efqcahur.fsf@gnu.org> <87infkv3ai.fsf@member.fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3O0r-0005Hz-S0 for bug-guix@gnu.org; Sat, 14 Oct 2017 11:06:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3O0o-00071u-MI for bug-guix@gnu.org; Sat, 14 Oct 2017 11:06:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e3O0o-00071W-HQ for bug-guix@gnu.org; Sat, 14 Oct 2017 11:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e3O0o-00082t-6o for bug-guix@gnu.org; Sat, 14 Oct 2017 11:06:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87infkv3ai.fsf@member.fsf.org> ("=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?="'s message of "Thu, 12 Oct 2017 22:39:17 +0800") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 28756@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable iyzsong@member.fsf.org (=E5=AE=8B=E6=96=87=E6=AD=A6) writes: > ludo@gnu.org (Ludovic Court=C3=A8s) writes: > >> Hello, >> >> Leo Famulari skribis: >> >>> I just upgraded to the latest Guix and, while downloading substitutes, I >>> noticed the progress bar seems to never reach 100%, as shown below. I'm >>> not sure if this started recently or not. >>> >>> Downloading https://mirror.hydra.gnu.org/guix/nar/gzip/drm4pj1k5mkb5784= i0rkqb0bg2z8lmyw-libabw-0.1.1... >>> libabw-0.1.1 346KiB >> >> Indeed, I=E2=80=99ve noticed too, and I think it relates to the new prog= ress >> reporters. =E5=AE=8B=E6=96=87=E6=AD=A6, do you experience this as well?= Thoughts? >> > > Yes, thanks for the report, commit abaee53c8 should fix it. > Well, it didn't... I have to learn it's a child process will read and report the process: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-guix-substitute-Report-the-last-process-in-the-child.patch >From 93b42f62ece1ad5181ed1119fc750bcbb74c5d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 14 Oct 2017 22:45:55 +0800 Subject: [PATCH] guix: substitute: Report the last process in the child process. Fixes . * guix/utils.scm (filtered-port): Close the 'input' port in the child process. * guix/scripts/substitute.scm (progress-substitution): Close the 'progress' port before 'restore-file'. --- guix/scripts/substitute.scm | 10 ++++++---- guix/utils.scm | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 921a7c679..d175d3e84 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -959,16 +959,18 @@ DESTINATION as a nar file. Verify the substitute against ACL." (decompressed-port (and=> (narinfo-compression narinfo) string->symbol) progress))) + ;; A child process of 'decompressed-port' will read from this 'process' + ;; port and thus report the actual progress to the console. As the + ;; parent process, we should close it at the start. + (close-port progress) ;; Unpack the Nar at INPUT into DESTINATION. (restore-file input destination) (close-port input) - (close-port progress) + (every (compose zero? cdr waitpid) pids) ;; Skip a line after what 'progress-reporter/file' printed, and another ;; one to visually separate substitutions. - (display "\n\n" (current-error-port)) - - (every (compose zero? cdr waitpid) pids)))) + (display "\n\n" (current-error-port))))) ;;; diff --git a/guix/utils.scm b/guix/utils.scm index de4aa6531..f8cf11ccb 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -153,6 +153,7 @@ buffered data is lost." (close-port in) (dump-port input out)) (lambda () + (close input) (false-if-exception (close out)) (primitive-_exit 0)))) (child -- 2.13.3 --=-=-= Content-Type: text/plain With this patch, update the guix snapshot and do a system reconfigure, this issue should be fixed! --=-=-=--