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

gnu: borg: Return #t from all phases. 

* gnu/packages/backup.scm (borg)[arguments]: Substitute INVOKE for
SYSTEM*. Return #t rather than undefined from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2018-06-24 21:56:38 +02:00
parent 4ce7c1b353
commit e252ec324d
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/backup.scm
View File

@ -523,8 +523,7 @@ detection, and lossless compression.")
;; The tests should be run in an empty directory. ;; The tests should be run in an empty directory.
(mkdir-p "tests") (mkdir-p "tests")
(with-directory-excursion "tests" (with-directory-excursion "tests"
(zero? (invoke "py.test" "-v" "--pyargs" "borg.testsuite" "-k"
(system* "py.test" "-v" "--pyargs" "borg.testsuite" "-k"
(string-append (string-append
;; These tests need to write to '/var'. ;; These tests need to write to '/var'.
"not test_get_cache_dir " "not test_get_cache_dir "
@ -541,7 +540,7 @@ detection, and lossless compression.")
;; These tests assume the kernel supports FUSE. ;; These tests assume the kernel supports FUSE.
"and not test_fuse " "and not test_fuse "
"and not test_fuse_allow_damaged_files " "and not test_fuse_allow_damaged_files "
"and not test_mount_hardlinks")))))) "and not test_mount_hardlinks")))))
(add-after 'install 'install-doc (add-after 'install 'install-doc
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -552,11 +551,9 @@ detection, and lossless compression.")
"docs/misc/internals-picture.txt" "docs/misc/internals-picture.txt"
"docs/misc/prune-example.txt")) "docs/misc/prune-example.txt"))
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
(and (invoke "python3" "setup.py" "build_man")
(zero? (system* "python3" "setup.py" "build_man"))
(begin
(copy-recursively "docs/man" man) (copy-recursively "docs/man" man)
#t)))))))) #t))))))
(native-inputs (native-inputs
`(("python-cython" ,python-cython) `(("python-cython" ,python-cython)
("python-setuptools-scm" ,python-setuptools-scm) ("python-setuptools-scm" ,python-setuptools-scm)