You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2017/03/06 21:16:37 UTC
[03/50] [abbrv] incubator-mynewt-newt git commit: MYNEWT-621;
check that package exists before referencing it.
MYNEWT-621; check that package exists before referencing it.
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/d3d719cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/d3d719cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/d3d719cd
Branch: refs/heads/master
Commit: d3d719cd1c3c7fdeb3e1fbb76da1903dfba9b8f6
Parents: 43f189c
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Sat Feb 11 12:24:26 2017 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Sat Feb 11 12:24:26 2017 -0800
----------------------------------------------------------------------
newt/resolve/resolve.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/d3d719cd/newt/resolve/resolve.go
----------------------------------------------------------------------
diff --git a/newt/resolve/resolve.go b/newt/resolve/resolve.go
index 8a675c0..283e96c 100644
--- a/newt/resolve/resolve.go
+++ b/newt/resolve/resolve.go
@@ -134,11 +134,11 @@ func NewResolvePkg(lpkg *pkg.LocalPackage) *ResolvePackage {
func (r *Resolver) resolveDep(dep *pkg.Dependency) (*pkg.LocalPackage, error) {
proj := project.GetProject()
- lpkg := proj.ResolveDependency(dep).(*pkg.LocalPackage)
- if lpkg == nil {
+ if proj.ResolveDependency(dep) == nil {
return nil, util.FmtNewtError("Could not resolve package dependency: "+
"%s; depender: %s", dep.String(), dep.Name)
}
+ lpkg := proj.ResolveDependency(dep).(*pkg.LocalPackage)
return lpkg, nil
}