From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: [PATCH] Work around behavior of old 'scandir' in Guile 2.0.5 Date: Sun, 06 Apr 2014 19:55:59 -0400 Message-ID: <87bnwet3lc.fsf@yeeloong.lan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWww8-0008ML-5P for guix-devel@gnu.org; Sun, 06 Apr 2014 19:57:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WWww2-0002SA-Us for guix-devel@gnu.org; Sun, 06 Apr 2014 19:57:16 -0400 Received: from world.peace.net ([96.39.62.75]:45437) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWww2-0002RB-PI for guix-devel@gnu.org; Sun, 06 Apr 2014 19:57:10 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain This patch is needed when Guix is built with Guile 2.0.5. Mark --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-Work-around-behavior-of-old-scandir-in-Guile-2.0.5.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] Work around behavior of old 'scandir' in Guile 2.0.5 >From a49c33418aa6814daf6fcab5978c27afbfe8ac9a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 6 Apr 2014 19:46:16 -0400 Subject: [PATCH] Work around behavior of old 'scandir' in Guile 2.0.5. Problem reported by John Darrington . * guix/nar.scm (write-file): Filter out "." and ".." from the result of 'scandir'. Previously we did this by passing a suitable predicate. --- guix/nar.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/guix/nar.scm b/guix/nar.scm index b642143..5b602df 100644 --- a/guix/nar.scm +++ b/guix/nar.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2012, 2013, 2014 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2014 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -177,13 +178,18 @@ sub-directories of FILE as needed." ((directory) (write-string "type" p) (write-string "directory" p) - (let* ((select? (negate (cut member <> '("." "..")))) - - ;; 'scandir' defaults to 'string-locale '("." ".."))) + ;; 'scandir' defaults to 'string-locale