01/06: graph: Use absolute file name canonicalization.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 3cabdead6fbe080d9466bb3130a2b36dd4b07090
Author: Ludovic Courtès <address@hidden>
Date:   Thu May 19 23:24:50 2016 +0200

    graph: Use absolute file name canonicalization.
    
    * guix/scripts/graph.scm (guix-graph): Wrap in 'with-fluids'.
---
 guix/scripts/graph.scm |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm
index ba63780..1623421 100644
--- a/guix/scripts/graph.scm
+++ b/guix/scripts/graph.scm
@@ -356,15 +356,18 @@ Emit a Graphviz (dot) representation of the dependencies 
of PACKAGE...\n"))
                                    (_ #f))
                                  opts)))
       (with-store store
-        (run-with-store store
-          ;; XXX: Since grafting can trigger unsolicited builds, disable it.
-          (mlet %store-monad ((_     (set-grafting #f))
-                              (nodes (mapm %store-monad
-                                           (node-type-convert type)
-                                           packages)))
-            (export-graph (concatenate nodes)
-                          (current-output-port)
-                          #:node-type type))))))
+        ;; Ask for absolute file names so that .drv file names passed from the
+        ;; user to 'read-derivation' are absolute when it returns.
+        (with-fluids ((%file-port-name-canonicalization 'absolute))
+          (run-with-store store
+            ;; XXX: Since grafting can trigger unsolicited builds, disable it.
+            (mlet %store-monad ((_     (set-grafting #f))
+                                (nodes (mapm %store-monad
+                                             (node-type-convert type)
+                                             packages)))
+              (export-graph (concatenate nodes)
+                            (current-output-port)
+                            #:node-type type)))))))
   #t)
 
 ;;; graph.scm ends here