From 224f7ad6a3627df538a345ae3d3e8dd3494ecab2 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 12 Jun 2012 23:30:00 +0200
Subject: Fix `imported-files' for files with a common prefix.

* guix/derivations.scm (imported-files)[builder]: For TAIL, check
  whether it exists before (mkdir TAIL).

* tests/derivations.scm ("imported-files"): Add file with a common
  prefix.
---
 guix/derivations.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'guix')

diff --git a/guix/derivations.scm b/guix/derivations.scm
index 47023f566c..9f5ab16d6d 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -412,7 +412,8 @@ (define (parent-dirs file-name)
                                                        `(false-if-exception
                                                          (mkdir ,d)))
                                                      head)
-                                                `((mkdir ,tail)))))
+                                                `((or (file-exists? ,tail)
+                                                      (mkdir ,tail))))))
                                      `((symlink ,store-path ,final-path)))))
                            files))))
     (build-expression->derivation store name (%current-system)
-- 
cgit v1.2.3