[mynewt-newt] branch master updated: Improve errors for invalid repo version strings

[cc...@apache.org]

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

ccollins 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 60fc2df  Improve errors for invalid repo version strings
60fc2df is described below

commit 60fc2df06bfc80e07c1e2fc9b5c4a73e01c8adc3
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Wed May 15 10:42:36 2019 -0700

    Improve errors for invalid repo version strings
    
    This fixes #297.
---
 newt/newtutil/repo_version.go | 6 ++++--
 newt/repo/repo.go             | 3 ++-
 newt/repo/version.go          | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/newt/newtutil/repo_version.go b/newt/newtutil/repo_version.go
index 3adcfa5..cc1280f 100644
--- a/newt/newtutil/repo_version.go
+++ b/newt/newtutil/repo_version.go
@@ -204,12 +204,14 @@ func ParseRepoVersion(verStr string) (RepoVersion, error) {
 	parts := strings.Split(base, ".")
 	if len(parts) > 3 {
 		return RepoVersion{},
-			util.FmtNewtError("Invalid version string: %s", verStr)
+			util.FmtNewtError("Invalid version string: \"%s\"; "+
+				"must be fixed (X.X.X) or floating (X[.X]-stability)", verStr)
 	}
 
 	if len(parts) != 3 && stability == VERSION_STABILITY_NONE {
 		return RepoVersion{},
-			util.FmtNewtError("Invalid version string: %s", verStr)
+			util.FmtNewtError("Invalid version string: \"%s\"; "+
+				"must be fixed (X.X.X) or floating (X[.X]-stability)", verStr)
 	}
 
 	// Assume no parts of the version are specified.
diff --git a/newt/repo/repo.go b/newt/repo/repo.go
index 4e3d394..feae366 100644
--- a/newt/repo/repo.go
+++ b/newt/repo/repo.go
@@ -512,7 +512,8 @@ func (r *Repo) Read() error {
 		log.Debugf("Printing version %s for remote repo %s", versStr, r.name)
 		vers, err := newtutil.ParseRepoVersion(versStr)
 		if err != nil {
-			return err
+			return util.PreNewtError(err,
+				"failure parsing version for repo \"%s\"", r.Name())
 		}
 
 		// store commit->version mapping
diff --git a/newt/repo/version.go b/newt/repo/version.go
index 46ef0a2..580a9cf 100644
--- a/newt/repo/version.go
+++ b/newt/repo/version.go
@@ -252,7 +252,8 @@ func (r *Repo) NormalizeVersion(
 
 		nextVer, err := newtutil.ParseRepoVersion(verStr)
 		if err != nil {
-			return ver, err
+			return ver, util.PreNewtError(err,
+				"failure parsing version for repo \"%s\"", r.Name())
 		}
 		ver = nextVer
 	}