[mynewt-newt] branch master updated: Relax empty values override restriction

[jerzy]

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newt.git


The following commit(s) were added to refs/heads/master by this push:
     new 4ced60b  Relax empty values override restriction
4ced60b is described below

commit 4ced60b427b7c6310db8cc02168caaa192e084e6
Author: Jerzy Kasenberg <jerzy.kasenb...@codecoup.pl>
AuthorDate: Fri Dec 4 12:41:03 2020 +0100

    Relax empty values override restriction
    
    With this change syscfg variables that are defined but don't have
    default values in syscfg.defs, can be set in other packages and not only
    bsp/app/target.
    
    This way MCU packages can set values that otherwise would have to be
    set by every BSP.
    
    Since there is no default value, single package that provides value
    is not creating any conflicts.
---
 newt/syscfg/syscfg.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newt/syscfg/syscfg.go b/newt/syscfg/syscfg.go
index 80d42eb..f6ccfa7 100644
--- a/newt/syscfg/syscfg.go
+++ b/newt/syscfg/syscfg.go
@@ -383,7 +383,7 @@ func (entry *CfgEntry) priorityViolations() []CfgPriority {
                curType := normalizePkgType(p.Source.Type())
                defType := normalizePkgType(entry.PackageDef.Type())
 
-               if p.Source != entry.PackageDef && curType <= defType {
+               if p.Source != entry.PackageDef && curType <= defType && 
entry.History[0].Value != "" {
                        priority := CfgPriority{
                                PackageDef:  entry.PackageDef,
                                PackageSrc:  p.Source,