guix-commits
[Top][All Lists]
Advanced

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

24/30: gnu: tzdata: Use invoke instead of system*.


From: Mark H. Weaver
Subject: 24/30: gnu: tzdata: Use invoke instead of system*.
Date: Fri, 16 Mar 2018 05:03:39 -0400 (EDT)

mhw pushed a commit to branch core-updates
in repository guix.

commit 408fcff67878636d88df3bfab8c983b32692900e
Author: Mark H Weaver <address@hidden>
Date:   Fri Mar 16 01:33:04 2018 -0400

    gnu: tzdata: Use invoke instead of system*.
    
    * gnu/packages/base.scm (tzdata)[arguments]: Use invoke.  Return a boolean
    from all phase procedures.
---
 gnu/packages/base.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a6da2f7..f3001cb 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1116,8 +1116,8 @@ command.")
        (modify-phases %standard-phases
          (replace 'unpack
            (lambda* (#:key source inputs #:allow-other-keys)
-             (and (zero? (system* "tar" "xvf" source))
-                  (zero? (system* "tar" "xvf" (assoc-ref inputs "tzcode"))))))
+             (invoke "tar" "xvf" source)
+             (invoke "tar" "xvf" (assoc-ref inputs "tzcode"))))
          (add-after 'install 'post-install
            (lambda* (#:key outputs #:allow-other-keys)
              ;; Move data in the right place.
@@ -1129,7 +1129,8 @@ command.")
                (copy-recursively (string-append out "/share/zoneinfo-leaps")
                                  (string-append out "/share/zoneinfo/right"))
                (delete-file-recursively
-                (string-append out "/share/zoneinfo-leaps")))))
+                (string-append out "/share/zoneinfo-leaps"))
+               #t)))
          (delete 'configure))))
     (inputs `(("tzcode" ,(origin
                           (method url-fetch)



reply via email to

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