Hi.
Would the attached patch work?
(note: tzdata-legacy does not seem to be necessary after all)
Thanks.
--- arduino-builder-1.3.25.orig/src/arduino.cc/builder/i18n/errors.go
+++ arduino-builder-1.3.25/src/arduino.cc/builder/i18n/errors.go
@@ -9,7 +9,8 @@ func ErrorfWithLogger(logger Logger, for
logger.Fprintln(os.Stderr, constants.LOG_LEVEL_ERROR, format, a...)
return errors.Errorf("")
}
- return errors.Errorf(Format(format, a...))
+ formattedMsg := Format(format, a...)
+ return errors.New(formattedMsg)
}
func WrapError(err error) error {
--- arduino-builder-1.3.25.orig/src/arduino.cc/builder/test/helper_tools_downloader.go
+++ arduino-builder-1.3.25/src/arduino.cc/builder/test/helper_tools_downloader.go
@@ -279,7 +279,7 @@ func findCoreUrl(index map[string]interf
}
}
- return constants.EMPTY_STRING, errors.Errorf("Unable to find tool " + core.Maintainer + " " + core.Arch + " " + core.Version)
+ return constants.EMPTY_STRING, errors.Errorf("Unable to find tool %s", core.Maintainer + " " + core.Arch + " " + core.Version)
}
func downloadTools(tools []Tool, index map[string]interface{}) error {
@@ -739,7 +739,7 @@ func findToolUrl(index map[string]interf
}
}
- return constants.EMPTY_STRING, errors.Errorf("Unable to find tool " + tool.Name + " " + tool.Version)
+ return constants.EMPTY_STRING, errors.Errorf("Unable to find tool %s", tool.Name + " " + tool.Version)
}
func downloadLibraries(libraries []Library, index map[string]interface{}) error {
@@ -769,7 +769,7 @@ func findLibraryUrl(index map[string]int
}
}
- return constants.EMPTY_STRING, errors.Errorf("Unable to find library " + library.Name + " " + library.Version)
+ return constants.EMPTY_STRING, errors.Errorf("Unable to find library %s", library.Name + " " + library.Version)
}
func downloadAndUnpackLibrary(library Library, url string, targetPath string) error {
@@ -850,7 +850,7 @@ func copyRecursive(from, to string) erro
return i18n.WrapError(err)
}
} else {
- return errors.Errorf("unable to copy file " + currentPath)
+ return errors.Errorf("unable to copy file %s", currentPath)
}
return nil
