From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Patterson Subject: [PATCH] services: cups: Follow symlinks when installing extensions. Date: Wed, 30 Nov 2016 16:17:45 -0500 Message-ID: <20161130161745.136f7c1f@uwaterloo.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCCGM-0005Xz-Sh for guix-devel@gnu.org; Wed, 30 Nov 2016 16:17:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCCGH-0007xA-Uo for guix-devel@gnu.org; Wed, 30 Nov 2016 16:17:58 -0500 Received: from mailchk-m03.uwaterloo.ca ([129.97.128.240]:44856) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCCGH-0007uR-P6 for guix-devel@gnu.org; Wed, 30 Nov 2016 16:17:53 -0500 Received: from localhost (bas1-jockvale05-184-145-105-117.dsl.bell.ca [184.145.105.117]) (authenticated bits=0) by mailchk-m03.uwaterloo.ca (8.14.4/8.14.4) with ESMTP id uAULHkL8014948 (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 30 Nov 2016 16:17:49 -0500 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" To: guix-devel@gnu.org Hello, This small patch fixes a build error I encountered when adding hplip to my cups-configuration-extensions. Thanks, -- Andy =46rom 5f1394b445dea80a37bddc9a9aa49d3498c2a8d3 Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Wed, 30 Nov 2016 16:00:13 -0500 Subject: [PATCH] services: cups: Follow symlinks when installing extensions. * gnu/services/cups.scm (union-directory): Use "stat" when calling "find-files" to follow symlinks. --- gnu/services/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 391046a..df1843e 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -894,7 +894,7 @@ IPP specifications.") (if (file-exists? dst) (format (current-error-port) "warning: ~a exists\n= " dst) (symlink src dst)))) - (find-files (string-append package path)))) + (find-files (string-append package path) #:stat stat))) (list #$@paths))) (list #$@packages)) #t)))) --=20 2.10.2