diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
| commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
| tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /tests/ui.scm | |
| parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
| parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) | |
| download | patches-18af6870370226b4d502d7372844e7f2aded5887.tar patches-18af6870370226b4d502d7372844e7f2aded5887.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
Diffstat (limited to 'tests/ui.scm')
| -rw-r--r-- | tests/ui.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ui.scm b/tests/ui.scm index 05eace6721..3dc6952e1f 100644 --- a/tests/ui.scm +++ b/tests/ui.scm @@ -252,12 +252,12 @@ Second line" 24)) (let* ((m (manifest (list guile-1.8.8))) (t (manifest-transaction (install (list guile-2.0.9))))) (with-store store - (and (string-match "guile\t1.8.8 → 2.0.9" + (and (string-match "guile +1.8.8 → 2.0.9" (with-fluids ((%default-port-encoding "UTF-8")) (with-error-to-string (lambda () (show-manifest-transaction store m t))))) - (string-match "guile\t1.8.8 -> 2.0.9" + (string-match "guile +1.8.8 -> 2.0.9" (with-error-to-string (lambda () ;; In Guile 2.2, %DEFAULT-PORT-ENCODING doesn't |