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/11/10 22:38:50 UTC
[38/50] incubator-mynewt-newt git commit: newt - fix "mfg create"
newt - fix "mfg create"
Newt was trying to read binaries from the bin/mfg/... directory before
copying them. Now it copies the files first.
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/c71f226e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/c71f226e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/c71f226e
Branch: refs/heads/master
Commit: c71f226e2dcdea00cd02b1ad2d3c4177a7dbefe4
Parents: 8b42835
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Nov 8 12:32:00 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Nov 8 12:32:00 2016 -0800
----------------------------------------------------------------------
newt/mfg/create.go | 4 ++++
newt/mfg/load.go | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/c71f226e/newt/mfg/create.go
----------------------------------------------------------------------
diff --git a/newt/mfg/create.go b/newt/mfg/create.go
index 7eaf982..1257b75 100644
--- a/newt/mfg/create.go
+++ b/newt/mfg/create.go
@@ -216,6 +216,10 @@ func (mi *MfgImage) createSections() (createState, error) {
var err error
+ if err := mi.detectOverlaps(); err != nil {
+ return cs, err
+ }
+
cs.dsMap, err = mi.deviceSectionMap()
if err != nil {
return cs, err
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/c71f226e/newt/mfg/load.go
----------------------------------------------------------------------
diff --git a/newt/mfg/load.go b/newt/mfg/load.go
index ef75d4d..4370cda 100644
--- a/newt/mfg/load.go
+++ b/newt/mfg/load.go
@@ -301,9 +301,5 @@ func Load(basePkg *pkg.LocalPackage) (*MfgImage, error) {
return nil, err
}
- if err := mi.detectOverlaps(); err != nil {
- return nil, err
- }
-
return mi, nil
}