ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

serialization: 'fold-archive' notifies about directory processing completion.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2020-12-09 21:50:21 +01:00
parent 7a2897149d
commit 465d2cb286
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
guix/scripts/archive.scm
View file

@ -347,6 +347,8 @@ (define (consume-input port size)
(match type
('directory
(format #t "D ~a~%" file))
('directory-complete
#t)
('symlink
(format #t "S ~a -> ~a~%" file content))
((or 'regular 'executable)

1
guix/scripts/challenge.scm
View file

@ -210,6 +210,7 @@ (define (archive-contents port)
(cons `(,file ,type ,(port-sha256* port size))
result))))
('directory result)
('directory-complete result)
('symlink
(cons `(,file ,type ,contents) result))))
'()

5
guix/serialization.scm
View file

@ -444,7 +444,8 @@ (define (read-eof-marker)
(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 @@ (define (restore-file port file)
(match type
('directory
(mkdir file))
('directory-complete
#t)
('symlink
(symlink content file))
((or 'regular 'executable)

6
tests/nar.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -218,8 +218,10 @@ (define-values (port get-bytevector)
'(("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)