guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/38: gnu: sendmail: Return #t from all phases.


From: Tobias Geerinckx-Rice
Subject: 07/38: gnu: sendmail: Return #t from all phases.
Date: Mon, 25 Jun 2018 22:24:22 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 55492129f55116acfe8ab42aefd00fa829c3ac58
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sun Jun 24 12:16:54 2018 +0200

    gnu: sendmail: Return #t from all phases.
    
    * gnu/packages/mail.scm (sendmail)[arguments]: Substitute INVOKE for
    SYSTEM*. Return #t rather than undefined from phases.
---
 gnu/packages/mail.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fef7bc3..d7963db 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1955,14 +1955,15 @@ define(`confLIBS', `-lresolv')
 define(`confINSTALL', `~a/devtools/bin/install.sh')
 define(`confDEPEND_TYPE', `CC-M')
 define(`confINST_DEP', `')
-" (getcwd))))))
+" (getcwd))))
+             #t))
          (replace 'build
            (lambda _
-             (and (zero? (system* "sh" "Build"))
-                  (with-directory-excursion "cf/cf"
-                    (begin
-                      (copy-file "generic-linux.mc" "sendmail.mc")
-                      (zero? (system* "sh" "Build" "sendmail.cf")))))))
+             (invoke "sh" "Build")
+             (with-directory-excursion "cf/cf"
+               (copy-file "generic-linux.mc" "sendmail.mc")
+               (invoke "sh" "Build" "sendmail.cf"))
+             #t))
          (add-before 'install 'pre-install
            (lambda _
              (let ((out (assoc-ref %outputs "out")))
@@ -1971,7 +1972,8 @@ define(`confINST_DEP', `')
                (mkdir-p (string-append out "/etc/mail"))
                (setenv "DESTDIR" out)
                (with-directory-excursion "cf/cf"
-                 (zero? (system* "sh" "Build" "install-cf")))))))
+                 (invoke "sh" "Build" "install-cf"))
+               #t))))
        ;; There is no make check.  There are some post installation tests, but 
those
        ;; require root privileges
        #:tests? #f))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]