From 09d809db6a37502b8cb2fb71748cc8bf500e117f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 7 May 2015 21:51:30 +0200
Subject: 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.
---
 guix/scripts/authenticate.scm |  8 +-------
 guix/scripts/substitute.scm   | 19 ++++---------------
 guix/serialization.scm        | 16 +++++-----------
 guix/ui.scm                   |  5 +----
 4 files changed, 11 insertions(+), 37 deletions(-)

(limited to 'guix')

diff --git a/guix/scripts/authenticate.scm b/guix/scripts/authenticate.scm
index e9900689fa..eedebb4bac 100644
--- a/guix/scripts/authenticate.scm
+++ b/guix/scripts/authenticate.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -82,12 +82,6 @@ to stdout upon success."
         (leave (_ "error: corrupt signature data: ~a~%")
                (canonical-sexp->string signature)))))
 
-(define %default-port-conversion-strategy
-  ;; This fluid is in Guile > 2.0.5.
-  (if (defined? '%default-port-conversion-strategy)
-      (@ (guile) %default-port-conversion-strategy)
-      (make-fluid #f)))
-
 
 ;;;
 ;;; Entry point with 'openssl'-compatible interface.  We support this
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 31559b7966..8b4fa36d2a 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -157,15 +157,12 @@ to the caller without emitting an error message."
                       (leave (_ "download from '~a' failed: ~a, ~s~%")
                              (uri->string (http-get-error-uri c))
                              code (http-get-error-reason c))))))
-       ;; On Guile 2.0.5, `http-fetch' fetches the whole thing at once.  So
-       ;; honor TIMEOUT? to disable the timeout when fetching a nar.
-       ;;
        ;; Test this with:
        ;;   sudo tc qdisc add dev eth0 root netem delay 1500ms
        ;; and then cancel with:
        ;;   sudo tc qdisc del dev eth0 root
        (let ((port #f))
-         (with-timeout (if (or timeout? (guile-version>? "2.0.5"))
+         (with-timeout (if timeout?
                            %fetch-timeout
                            0)
            (begin
@@ -649,17 +646,9 @@ PORT.  REPORT-PROGRESS is a two-argument procedure such as that returned by
       ;; XXX: We're not in control, so we always return anyway.
       n))
 
-  ;; Since `http-fetch' in Guile 2.0.5 returns all the data once it's done,
-  ;; don't pretend to report any progress in that case.
-  (if (guile-version>? "2.0.5")
-      (make-custom-binary-input-port "progress-port-proc"
-                                     read! #f #f
-                                     (cut close-port port))
-      (begin
-        (format (current-error-port) (_ "Downloading, please wait...~%"))
-        (format (current-error-port)
-                (_ "(Please consider upgrading Guile to get proper progress report.)~%"))
-        port)))
+  (make-custom-binary-input-port "progress-port-proc"
+                                 read! #f #f
+                                 (cut close-port port)))
 
 (define-syntax with-networking
   (syntax-rules ()
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)
diff --git a/guix/ui.scm b/guix/ui.scm
index e717ab713e..911e5ee868 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -852,11 +852,8 @@ parameter of 'args-fold'."
   (define dot-scm?
     (cut string-suffix? ".scm" <>))
 
-  ;; In Guile 2.0.5 `scandir' would return "." and ".." regardless even though
-  ;; they don't match `dot-scm?'.  Work around it by doing additional
-  ;; filtering.
   (if directory
-      (filter dot-scm? (scandir directory dot-scm?))
+      (scandir directory dot-scm?)
       '()))
 
 (define (commands)
-- 
cgit v1.2.3