[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: build: go-build-system: Follow-up to commit f42e4ebb56.
From: |
guix-commits |
Subject: |
01/01: build: go-build-system: Follow-up to commit f42e4ebb56. |
Date: |
Sun, 5 May 2019 23:07:41 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit a321312e3aec8f2884ab3f3cb35e2020195b5a08
Author: Maxim Cournoyer <address@hidden>
Date: Sun May 5 23:01:03 2019 -0400
build: go-build-system: Follow-up to commit f42e4ebb56.
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.
---
guix/build/go-build-system.scm | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm
index 22427a8..858068b 100644
--- a/guix/build/go-build-system.scm
+++ b/guix/build/go-build-system.scm
@@ -174,8 +174,7 @@ unpacking."
(when (file-is-directory? top-level-file)
(copy-recursively top-level-file dest #:keep-mtime? #t)))
(_
- (copy-recursively "." dest #:keep-mtime? #t)))
- #t))
+ (copy-recursively "." dest #:keep-mtime? #t)))))
(delete-file-recursively scratch-dir)))
(when (string-null? import-path)
@@ -185,10 +184,9 @@ unpacking."
(let ((dest (string-append (getenv "GOPATH") "/src/" unpack-path)))
(mkdir-p dest)
(if (file-is-directory? source)
- (begin
- (copy-recursively source dest #:keep-mtime? #t)
- #t)
- (unpack-maybe-strip source dest))))
+ (copy-recursively source dest #:keep-mtime? #t)
+ (unpack-maybe-strip source dest)))
+ #t)
(define (go-package? name)
(string-prefix? "go-" name))