diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-01-26 00:15:26 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-01-26 00:15:26 -0500 |
| commit | b89d8a4271c8ef02c9b1e51a2c86341cdc09c760 (patch) | |
| tree | f8e763584ac99d810135956cb09511434a703821 /guix/build | |
| parent | 7bf0170e9fbcb08f9edb875dc08e27584826a1c2 (diff) | |
| parent | a81f7eb858bf7e320d4dccde183d303247b6d47a (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/dub-build-system.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/guix/build/dub-build-system.scm b/guix/build/dub-build-system.scm index 432d51f6a7..ed86635708 100644 --- a/guix/build/dub-build-system.scm +++ b/guix/build/dub-build-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,14 +70,14 @@ (zero? (system* "dub" "add-path" vendor-dir)))) (define (grep string file-name) - "Find the first occurence of STRING in the file named FILE-NAME. - Return the position of this occurence, or #f if none was found." + "Find the first occurrence of STRING in the file named FILE-NAME. + Return the position of this occurrence, or #f if none was found." (string-contains (call-with-input-file file-name get-string-all) string)) (define (grep* string file-name) - "Find the first occurence of STRING in the file named FILE-NAME. - Return the position of this occurence, or #f if none was found. + "Find the first occurrence of STRING in the file named FILE-NAME. + Return the position of this occurrence, or #f if none was found. If the file named FILE-NAME doesn't exist, return #f." (catch 'system-error (lambda () |