activation: Fix deletion of setuid programs.

* guix/build/activation.scm (activate-setuid-programs): When
  %SETUID-DIRECTORY exists, pass the right file names to 'delete-file'.
master
Ludovic Courtès 2014-05-04 00:18:46 +02:00
parent e102f94097
commit ad896f23a5
1 changed files with 3 additions and 1 deletions

View File

@ -19,6 +19,7 @@
(define-module (guix build activation)
#:use-module (guix build utils)
#:use-module (ice-9 ftw)
#:use-module (srfi srfi-26)
#:export (activate-etc
activate-setuid-programs))
@ -85,7 +86,8 @@
(format #t "setting up setuid programs in '~a'...~%"
%setuid-directory)
(if (file-exists? %setuid-directory)
(for-each delete-file
(for-each (compose delete-file
(cut string-append %setuid-directory "/" <>))
(scandir %setuid-directory
(lambda (file)
(not (member file '("." ".."))))