diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-01-02 22:22:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-02 22:25:41 +0100 |
| commit | 51385362f76e2f823ac8d8cf720d06c386504069 (patch) | |
| tree | 7d665f8b57fce9c165f03581dc3450203d1ab3d3 | |
| parent | f88282af38dfe805034686e88bab734c582ef74d (diff) | |
| download | patches-51385362f76e2f823ac8d8cf720d06c386504069.tar patches-51385362f76e2f823ac8d8cf720d06c386504069.tar.gz | |
graph: %BAG-WITH-ORIGINS-NODE-TYPE includes the origin's guile.
Before that it would include #f for most origins since that the default
value of 'origin-patch-guile'.
* guix/scripts/graph.scm (bag-node-edges): When 'origin-patch-guile'
returns #f, use (default-guile).
* tests/graph.scm ("bag DAG, including origins"): Check for an edge from
O to (default-guile).
| -rw-r--r-- | guix/scripts/graph.scm | 2 | ||||
| -rw-r--r-- | tests/graph.scm | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 9d9eb2236c..dcc4701779 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -113,7 +113,7 @@ Dependencies may include packages, origin, and file names." (((labels things . outputs) ...) things))) ((origin? thing) - (cons (origin-patch-guile thing) + (cons (or (origin-patch-guile thing) (default-guile)) (if (or (pair? (origin-patches thing)) (origin-snippet thing)) (match (origin-patch-inputs thing) diff --git a/tests/graph.scm b/tests/graph.scm index daf64dc56d..4f85432d2f 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -150,7 +150,8 @@ edges." (let-values (((nodes edges) (nodes+edges))) (run-with-store %store (mlet %store-monad ((o* (lower-object o)) - (p* (lower-object p))) + (p* (lower-object p)) + (g (lower-object (default-guile)))) (return (and (find (match-lambda ((file "the-uri") #t) @@ -160,6 +161,13 @@ edges." ((source target) (and (string=? source (derivation-file-name p*)) (string=? target o*)))) + edges) + + ;; There must also be an edge from O to G. + (find (match-lambda + ((source target) + (and (string=? source o*) + (string=? target (derivation-file-name g))))) edges))))))))) (test-assert "derivation DAG" |