diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-07 21:51:30 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-10 11:07:51 +0200 |
| commit | 09d809db6a37502b8cb2fb71748cc8bf500e117f (patch) | |
| tree | e3ad070986294fbee93264cd7c8af6221b4359f3 /guix/serialization.scm | |
| parent | 47c66da00b737b28f27429e472c71cf987409b60 (diff) | |
| download | gnu-guix-09d809db6a37502b8cb2fb71748cc8bf500e117f.tar gnu-guix-09d809db6a37502b8cb2fb71748cc8bf500e117f.tar.gz | |
Remove assorted Guile 2.0.5 workarounds.
* guix/scripts/authenticate.scm (%default-port-conversion-strategy):
Remove.
* guix/scripts/substitute.scm (fetch): Remove 2.0.5 special cases.
* guix/serialization.scm (write-file): Remove 'scandir' workaround.
* guix/ui.scm (command-files): Likewise.
Diffstat (limited to 'guix/serialization.scm')
| -rw-r--r-- | guix/serialization.scm | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/guix/serialization.scm b/guix/serialization.scm index 51d7ef76c6..7a3defc03d 100644 --- a/guix/serialization.scm +++ b/guix/serialization.scm @@ -279,17 +279,11 @@ sub-directories of FILE as needed." (write-string "type" p) (write-string "directory" p) (let ((entries - ;; NOTE: Guile 2.0.5's 'scandir' returns all subdirectories - ;; unconditionally, including "." and "..", regardless of the - ;; 'select?' predicate passed to it, so we have to filter - ;; those out externally. - (filter (negate (cut member <> '("." ".."))) - ;; 'scandir' defaults to 'string-locale<?' to sort - ;; files, but this happens to be case-insensitive (at - ;; least in 'en_US' locale on libc 2.18.) Conversely, - ;; we want files to be sorted in a case-sensitive - ;; fashion. - (scandir f (const #t) string<?)))) + ;; 'scandir' defaults to 'string-locale<?' to sort files, but + ;; this happens to be case-insensitive (at least in 'en_US' + ;; locale on libc 2.18.) Conversely, we want files to be + ;; sorted in a case-sensitive fashion. + (scandir f (negate (cut member <> '("." ".."))) string<?))) (for-each (lambda (e) (let ((f (string-append f "/" e))) (write-string "entry" p) |