nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cve: Disable position recording while reading the CVE list. 

* guix/cve.scm (fetch-vulnerabilities)[read*]: New procedure.
Use it in lieu of 'read'.
This commit is contained in:
Ludovic Courtès 2017-09-19 21:24:31 +02:00
parent 6ab63268e4
commit f1b65d0dd9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
guix/cve.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -229,11 +229,24 @@ the given TTL (fetch from the NIST web site when TTL has expired)."
(now (current-time time-utc))) (now (current-time time-utc)))
(< (+ (stat:mtime s) ttl) (time-second now)))) (< (+ (stat:mtime s) ttl) (time-second now))))
(define (read* port)
;; Disable read options to avoid populating the source property weak
;; table, which speeds things up, saves memory, and works around
;; <https://lists.gnu.org/archive/html/guile-devel/2017-09/msg00031.html>.
(let ((options (read-options)))
(dynamic-wind
(lambda ()
(read-disable 'positions))
(lambda ()
(read port))
(lambda ()
(read-options options)))))
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
(if (old? cache) (if (old? cache)
(update-cache) (update-cache)
(match (call-with-input-file cache read) (match (call-with-input-file cache read*)
(('vulnerabilities 1 vulns) (('vulnerabilities 1 vulns)
(map sexp->vulnerability vulns)) (map sexp->vulnerability vulns))
(x (x