~ruther/guix-local: profiles: Deal with non-directory items in share/icons.

1ba4796d135ba7a07f2e89126fba673601c321c2 — Ludovic Courtès 10 years ago 6a669bd

profiles: Deal with non-directory items in share/icons.

Reported by Mark H Weaver <mhw@netris.org>.

* guix/profiles.scm (gtk-icon-themes)[build]: Check whether DIR is a directory
  before calling 'ensure-writable-directory'.

patch browse .tar.gz

1 files changed, 6 insertions(+), 3 deletions(-)

M guix/profiles.scm

M guix/profiles.scm => guix/profiles.scm +6 -3

@@ 649,9 649,12 @@ creates the GTK+ 'icon-theme.cache' file for each theme."
             ;; Update the 'icon-theme.cache' file for each icon theme.
             (for-each
              (lambda (theme)
-               (let ((dir (string-append #$output "/share/icons/" theme)))
-                 (ensure-writable-directory dir)
-                 (system* update-icon-cache "-t" dir)))
+               (let ((dir (string-append destdir "/" theme)))
+                 ;; Occasionally DESTDIR contains plain files, such as
+                 ;; "abiword_48.png".  Ignore these.
+                 (when (file-is-directory? dir)
+                   (ensure-writable-directory dir)
+                   (system* update-icon-cache "-t" dir))))
              (scandir destdir (negate (cut member <> '("." ".."))))))))
 
     ;; Don't run the hook when there's nothing to do.