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:44:06 UTC
[06/41] 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/df3061f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/df3061f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/df3061f6
Branch: refs/heads/mynewt_1_0_0
Commit: df3061f6cdb7fd75e49652fd7d7ec342e721fbde
Parents: 3868c59
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Sat Feb 11 12:24:26 2017 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Mar 6 13:30:29 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/df3061f6/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
}