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

packages: Gracefully print packages whose 'location' is #f. 

* guix/packages.scm (<package> printer): Check whether LOC is #f.
* tests/packages.scm ("printer with location", "printer without
  location"): New tests.
This commit is contained in:
Ludovic Courtès 2014-10-08 23:06:19 +02:00
parent 9c814b828a
commit 2e1bafb034
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/packages.scm
View File

@ -229,11 +229,14 @@ corresponds to the arguments expected by `set-path-environment-variable'."
(lambda (package port) (lambda (package port)
(let ((loc (package-location package)) (let ((loc (package-location package))
(format simple-format)) (format simple-format))
(format port "#<package ~a-~a ~a:~a ~a>" (format port "#<package ~a-~a ~a~a>"
(package-name package) (package-name package)
(package-version package) (package-version package)
(if loc
(format #f "~a:~a "
(location-file loc) (location-file loc)
(location-line loc) (location-line loc))
"")
(number->string (object-address (number->string (object-address
package) package)
16))))) 16)))))

23
tests/packages.scm
View File

@ -19,7 +19,12 @@
(define-module (test-packages) (define-module (test-packages)
#:use-module (guix tests) #:use-module (guix tests)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix utils) #:use-module ((guix utils)
;; Rename the 'location' binding to allow proper syntax
;; matching when setting the 'location' field of a package.
#:renamer (lambda (name)
(cond ((eq? name 'location) 'make-location)
(else name))))
#:use-module (guix hash) #:use-module (guix hash)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix packages) #:use-module (guix packages)
@ -34,6 +39,7 @@
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-64) #:use-module (srfi srfi-64)
#:use-module (rnrs io ports) #:use-module (rnrs io ports)
#:use-module (ice-9 regex)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
;; Test the high-level packaging layer. ;; Test the high-level packaging layer.
@ -52,6 +58,21 @@
(home-page #f) (license #f) (home-page #f) (license #f)
extra-fields ...)) extra-fields ...))
(test-assert "printer with location"
(string-match "^#<package foo-0 foo.scm:42 [[:xdigit:]]+>$"
(with-output-to-string
(lambda ()
(write
(dummy-package "foo"
(location (make-location "foo.scm" 42 7))))))))
(test-assert "printer without location"
(string-match "^#<package foo-0 [[:xdigit:]]+>$"
(with-output-to-string
(lambda ()
(write
(dummy-package "foo" (location #f)))))))
(test-assert "package-field-location" (test-assert "package-field-location"
(let () (let ()
(define (goto port line column) (define (goto port line column)