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/09/07 18:38:00 UTC
incubator-mynewt-newt git commit: newt - Put paths of conflicting
packages in error.
Repository: incubator-mynewt-newt
Updated Branches:
refs/heads/develop 45479e436 -> 75c540e6b
newt - Put paths of conflicting packages in error.
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/75c540e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/75c540e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/75c540e6
Branch: refs/heads/develop
Commit: 75c540e6b4875101fed5c6607a46df643f4d1cfb
Parents: 45479e4
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Sep 7 11:37:35 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Sep 7 11:37:35 2016 -0700
----------------------------------------------------------------------
newt/pkg/localpackage.go | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/75c540e6/newt/pkg/localpackage.go
----------------------------------------------------------------------
diff --git a/newt/pkg/localpackage.go b/newt/pkg/localpackage.go
index b7f5b9c..5f3b115 100644
--- a/newt/pkg/localpackage.go
+++ b/newt/pkg/localpackage.go
@@ -402,9 +402,10 @@ func ReadLocalPackageRecursive(repo *repo.Repo,
}
if oldPkg, ok := pkgList[pkg.Name()]; ok {
- errStr := fmt.Sprintf("Multiple packages with same pkg.name=%s in repo %s\n",
- oldPkg.FullName(), repo.Name())
- return util.NewNewtError(errStr)
+ oldlPkg := oldPkg.(*LocalPackage)
+ return util.FmtNewtError("Multiple packages with same pkg.name=%s "+
+ "in repo %s; path1=%s path2=%s", oldlPkg.Name(), repo.Name(),
+ oldlPkg.BasePath(), pkg.BasePath())
}
pkgList[pkg.Name()] = pkg