From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8ELCN+WL0180CgAA0tVLHw (envelope-from ) for ; Fri, 11 Dec 2020 15:10:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iGp1M+WL019cHgAAbx9fmQ (envelope-from ) for ; Fri, 11 Dec 2020 15:10:29 +0000 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 19E2F940367 for ; Fri, 11 Dec 2020 15:10:29 +0000 (UTC) Received: from localhost ([::1]:58944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk3v-0004L4-8S for larch@yhetil.org; Fri, 11 Dec 2020 10:10:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knk3W-0004I7-Jm for bug-guix@gnu.org; Fri, 11 Dec 2020 10:10:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knk3W-0000cx-Ag for bug-guix@gnu.org; Fri, 11 Dec 2020 10:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knk3W-0007jE-4N for bug-guix@gnu.org; Fri, 11 Dec 2020 10:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#44760: [PATCH 01/15] serialization: 'fold-archive' notifies about directory processing completion. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 11 Dec 2020 15:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44760 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 44760@debbugs.gnu.org Received: via spool by 44760-submit@debbugs.gnu.org id=B44760.160769938129571 (code B ref 44760); Fri, 11 Dec 2020 15:10:02 +0000 Received: (at 44760) by debbugs.gnu.org; 11 Dec 2020 15:09:41 +0000 Received: from localhost ([127.0.0.1]:42561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knk3A-0007gn-SA for submit@debbugs.gnu.org; Fri, 11 Dec 2020 10:09:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knk39-0007gO-HK for 44760@debbugs.gnu.org; Fri, 11 Dec 2020 10:09:39 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47528) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk34-0000Sc-Db; Fri, 11 Dec 2020 10:09:34 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59324 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1knk33-0004Tz-2B; Fri, 11 Dec 2020 10:09:33 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 11 Dec 2020 16:09:11 +0100 Message-Id: <20201211150919.18435-2-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211150919.18435-1-ludo@gnu.org> References: <87h7pkffzy.fsf@inria.fr> <20201211150919.18435-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.80 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 19E2F940367 X-Spam-Score: -1.80 X-Migadu-Scanner: scn1.migadu.com X-TUID: qxP5VWi/XLQJ * guix/serialization.scm (fold-archive): Call PROC with a 'directory-complete tag when done with a directory. (restore-file): Handle it. * guix/scripts/archive.scm (list-contents): Likewise. * guix/scripts/challenge.scm (archive-contents): Likewise. * tests/nar.scm ("write-file-tree + fold-archive"): Adjust accordingly. --- guix/scripts/archive.scm | 2 ++ guix/scripts/challenge.scm | 1 + guix/serialization.scm | 5 ++++- tests/nar.scm | 6 ++++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index c04baf9784..1f73fff711 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -347,6 +347,8 @@ output port." (match type ('directory (format #t "D ~a~%" file)) + ('directory-complete + #t) ('symlink (format #t "S ~a -> ~a~%" file content)) ((or 'regular 'executable) diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm index 39bd2c1c0f..d0a456ac1d 100644 --- a/guix/scripts/challenge.scm +++ b/guix/scripts/challenge.scm @@ -210,6 +210,7 @@ taken since we do not import the archives." (cons `(,file ,type ,(port-sha256* port size)) result)))) ('directory result) + ('directory-complete result) ('symlink (cons `(,file ,type ,contents) result)))) '() diff --git a/guix/serialization.scm b/guix/serialization.scm index 836ad06caf..cc56134ef4 100644 --- a/guix/serialization.scm +++ b/guix/serialization.scm @@ -444,7 +444,8 @@ depends on TYPE." (file file) (token x)))))) (loop (read-string port) result))))) - (")" result) ;done with DIR + (")" ;done with DIR + (proc file 'directory-complete #f result)) (x (raise (condition @@ -463,6 +464,8 @@ Restore it as FILE." (match type ('directory (mkdir file)) + ('directory-complete + #t) ('symlink (symlink content file)) ((or 'regular 'executable) diff --git a/tests/nar.scm b/tests/nar.scm index aeff3d3330..b542ebd47c 100644 --- a/tests/nar.scm +++ b/tests/nar.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -218,8 +218,10 @@ '(("R" directory #f) ("R/dir" directory #f) ("R/dir/exe" executable "1234") + ("R/dir" directory-complete #f) ("R/foo" regular "abcdefg") - ("R/lnk" symlink "foo")) + ("R/lnk" symlink "foo") + ("R" directory-complete #f)) (let () (define-values (port get-bytevector) -- 2.29.2