+ debug message

Author: d-a-v

legacy/builder/constants/constants.go

@@ -124,6 +124,7 @@ const MSG_USING_CACHED_INCLUDES = "Using cached library dependencies for file: {
 const MSG_WARNING_LIB_INVALID_CATEGORY = "WARNING: Category '{0}' in library {1} is not valid. Setting to '{2}'"
 const MSG_WARNING_PLATFORM_OLD_VALUES = "Warning: platform.txt from core '{0}' contains deprecated {1}, automatically converted to {2}. Consider upgrading this core."
 const MSG_WARNING_SPURIOUS_FILE_IN_LIB = "WARNING: Spurious {0} folder in '{1}' library"
+const MSG_INVESTIGATE = " (unusual state to investigate)"
 const PACKAGE_NAME = "name"
 const PACKAGE_TOOLS = "tools"
 const PLATFORM_ARCHITECTURE = "architecture"

legacy/builder/wipeout_build_path_if_build_options_changed.go

@@ -44,14 +44,19 @@ func (s *WipeoutBuildPathIfBuildOptionsChanged) Run(ctx *types.Context) error {
 	json.Unmarshal([]byte(buildOptionsJson), &opts)
 	json.Unmarshal([]byte(previousBuildOptionsJson), &prevOpts)
 
+	if prevOpts == nil {
+		ctx.GetLogger().Println(constants.LOG_LEVEL_DEBUG, constants.MSG_BUILD_OPTIONS_CHANGED + constants.MSG_INVESTIGATE);
+		return doCleanup(ctx.BuildPath)
+	}
+
 	// If SketchLocation path is different but filename is the same, consider it equal
-	if prevOpts != nil && filepath.Base(opts.Get("sketchLocation")) == filepath.Base(prevOpts.Get("sketchLocation")) {
+	if filepath.Base(opts.Get("sketchLocation")) == filepath.Base(prevOpts.Get("sketchLocation")) {
 		opts.Remove("sketchLocation")
 		prevOpts.Remove("sketchLocation")
 	}
 
 	// If options are not changed check if core has
-	if prevOpts != nil && opts.Equals(prevOpts) {
+	if opts.Equals(prevOpts) {
 		// check if any of the files contained in the core folders has changed
 		// since the json was generated - like platform.txt or similar
 		// if so, trigger a "safety" wipe