diff options
| author | Leo Famulari <leo@famulari.name> | 2016-07-22 18:57:40 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-07-22 18:58:31 -0400 |
| commit | d227260d2f7833b6bdc55b8e3792378626ef3b69 (patch) | |
| tree | 26d47d5d8ee8efb102323bca215429a8f8fe1095 /tests/guix-system.sh | |
| parent | d778fa5ff6f4a860919eaf13db3f84cfc68cbee8 (diff) | |
| parent | 26ad4adb5568c6ff370f446431b079520fb09615 (diff) | |
| download | guix-patches-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar guix-patches-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar.gz | |
Merge branch 'master' into core-updates
Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.
Diffstat (limited to 'tests/guix-system.sh')
| -rw-r--r-- | tests/guix-system.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh index d9e1679ae7..77d4e28999 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -139,7 +139,7 @@ if guix system build "$tmpfile" 2> "$errorfile" then exit 1 else - grep "service 'buggy!'.*'does-not-exist'.*undefined" "$errorfile" + grep "service 'buggy!'.*'does-not-exist'.*not provided" "$errorfile" fi # Reporting inconsistent user accounts. |