Patchwork services: cups: Follow symlinks when installing extensions.

login
register
mail settings
Submitter Andy Patterson
Date Nov. 30, 2016, 9:17 p.m.
Message ID <20161130161745.136f7c1f@uwaterloo.ca>
Download mbox | patch
Permalink /patch/18079/
State New
Headers show

Comments

Andy Patterson - Nov. 30, 2016, 9:17 p.m.
Hello,

This small patch fixes a build error I encountered when adding hplip to
my cups-configuration-extensions.

Thanks,

--
Andy

From 5f1394b445dea80a37bddc9a9aa49d3498c2a8d3 Mon Sep 17 00:00:00 2001
From: Andy Patterson <ajpatter@uwaterloo.ca>
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(-)
Andy Wingo - Dec. 1, 2016, 10:04 a.m.
Hi,

On Wed 30 Nov 2016 22:17, Andy Patterson <ajpatter@uwaterloo.ca> writes:

> This small patch fixes a build error I encountered when adding hplip to
> my cups-configuration-extensions.

Thanks, applied.  In a better world, all these CUPS packages will be not
doing so much symlinking in their output dirs, but the perfect is the
enemy of the good :)

Andy

Patch

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))))