04/05: gnu-maintenance: Use 'http-fetch/cached' by default.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 9aec35d265a8f37d8bfe47d5b2baa701c8f03009
Author: Ludovic Courtès <address@hidden>
Date:   Sat Oct 17 13:04:12 2015 +0200

    gnu-maintenance: Use 'http-fetch/cached' by default.
    
    This speeds up operations like 'guix lint -c gnu-description'.
    
    * guix/gnu-maintenance.scm (official-gnu-packages): Add 'fetch'
      parameter and honor it.  Default to 'http-fetch/cached'.
---
 guix/gnu-maintenance.scm |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index ac83df4..920aae2 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -116,8 +116,10 @@
   (doc-urls         gnu-package-doc-urls)         ; list of strings
   (download-url     gnu-package-download-url))
 
-(define (official-gnu-packages)
-  "Return a list of records, which are GNU packages."
+(define* (official-gnu-packages
+          #:optional (fetch http-fetch/cached))
+  "Return a list of records, which are GNU packages.  Use FETCH,
+to fetch the list of GNU packages over HTTP."
   (define (read-records port)
     ;; Return a list of alists.  Each alist contains fields of a GNU
     ;; package.
@@ -129,8 +131,7 @@
                 (cons alist result)))))
 
   (define official-description
-    (let ((db (read-records (http-fetch %package-description-url
-                                        #:text? #t))))
+    (let ((db (read-records (fetch %package-description-url #:text? #t))))
       (lambda (name)
         ;; Return the description found upstream for package NAME, or #f.
         (and=> (find (lambda (alist)
@@ -160,7 +161,7 @@
                                 "doc-url"
                                 "download-url")
                           '("doc-url" "language"))))
-       (read-records (http-fetch %package-list-url #:text? #t))))
+       (read-records (fetch %package-list-url #:text? #t))))
 
 (define (find-packages regexp)
   "Find GNU packages which satisfy REGEXP."