You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/12/30 02:35:35 UTC
[2/2] incubator-mynewt-newt git commit: newt - Fix split-image
(rev)depgraph
newt - Fix split-image (rev)depgraph
In split images, some dependencies were not displayed in the dependency
graph (and reverse dependency graph).
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/ab267a17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/ab267a17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/ab267a17
Branch: refs/heads/develop
Commit: ab267a17a27fd89ee4c879c07a5e448e72d7cc59
Parents: 660e916
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Dec 29 18:28:51 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Thu Dec 29 18:35:27 2016 -0800
----------------------------------------------------------------------
newt/builder/depgraph.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/ab267a17/newt/builder/depgraph.go
----------------------------------------------------------------------
diff --git a/newt/builder/depgraph.go b/newt/builder/depgraph.go
index 76a1bfa..647028e 100644
--- a/newt/builder/depgraph.go
+++ b/newt/builder/depgraph.go
@@ -100,7 +100,9 @@ func mergeDepGraphs(graphs ...DepGraph) DepGraph {
for _, graph := range graphs {
for parent, children := range graph {
- gm[parent] = map[*pkg.LocalPackage]struct{}{}
+ if gm[parent] == nil {
+ gm[parent] = map[*pkg.LocalPackage]struct{}{}
+ }
for _, child := range children {
graphMapAdd(gm, parent, child)
@@ -109,6 +111,7 @@ func mergeDepGraphs(graphs ...DepGraph) DepGraph {
}
dg := graphMapToDepGraph(gm)
+
return dg
}