unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] services: cups: Follow symlinks when installing extensions.
@ 2016-11-30 21:17 Andy Patterson
  2016-12-01 10:04 ` Andy Wingo
  0 siblings, 1 reply; 2+ messages in thread
From: Andy Patterson @ 2016-11-30 21:17 UTC (permalink / raw)
  To: guix-devel

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

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] services: cups: Follow symlinks when installing extensions.
  2016-11-30 21:17 [PATCH] services: cups: Follow symlinks when installing extensions Andy Patterson
@ 2016-12-01 10:04 ` Andy Wingo
  0 siblings, 0 replies; 2+ messages in thread
From: Andy Wingo @ 2016-12-01 10:04 UTC (permalink / raw)
  To: Andy Patterson; +Cc: guix-devel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-12-01 10:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-30 21:17 [PATCH] services: cups: Follow symlinks when installing extensions Andy Patterson
2016-12-01 10:04 ` Andy Wingo

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).