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

build: go-build-system: Follow-up to commit f42e4ebb56.

Browse source 
This follows commit f42e4ebb56, which made it so that the unpack phase return
value could be left unspecified.

* guix/build/go-build-system.scm (unpack): Ensure that the value returned upon
a successful completion of the phase is #t.
This commit is contained in:
Maxim Cournoyer 2019-05-05 23:01:03 -04:00
parent 2edec51c5e
commit a321312e3a
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guix/build/go-build-system.scm
View file

@ -174,8 +174,7 @@ (define (unpack-maybe-strip source dest)
(when (file-is-directory? top-level-file) (when (file-is-directory? top-level-file)
(copy-recursively top-level-file dest #:keep-mtime? #t))) (copy-recursively top-level-file dest #:keep-mtime? #t)))
(_ (_
(copy-recursively "." dest #:keep-mtime? #t))) (copy-recursively "." dest #:keep-mtime? #t)))))
#t))
(delete-file-recursively scratch-dir))) (delete-file-recursively scratch-dir)))
(when (string-null? import-path) (when (string-null? import-path)
@ -185,10 +184,9 @@ (define (unpack-maybe-strip source dest)
(let ((dest (string-append (getenv "GOPATH") "/src/" unpack-path))) (let ((dest (string-append (getenv "GOPATH") "/src/" unpack-path)))
(mkdir-p dest) (mkdir-p dest)
(if (file-is-directory? source) (if (file-is-directory? source)
(begin (copy-recursively source dest #:keep-mtime? #t)
(copy-recursively source dest #:keep-mtime? #t) (unpack-maybe-strip source dest)))
#t) #t)
(unpack-maybe-strip source dest))))
(define (go-package? name) (define (go-package? name)
(string-prefix? "go-" name)) (string-prefix? "go-" name))