You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/03/09 21:23:38 UTC
[23/50] incubator-mynewt-newt git commit: add prompt for upgrade.
remove debug text from previous version. use proper define for version
stability
add prompt for upgrade. remove debug text from previous version. use proper define for version stability
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/9351ecf9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/9351ecf9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/9351ecf9
Branch: refs/heads/develop
Commit: 9351ecf970e4eacf800a16f5a33df3eae75e0365
Parents: ec23685
Author: Sterling Hughes <st...@apache.org>
Authored: Tue Mar 8 17:28:08 2016 -0800
Committer: Sterling Hughes <st...@apache.org>
Committed: Tue Mar 8 17:28:08 2016 -0800
----------------------------------------------------------------------
newt/project/project.go | 15 ++++++++++++++-
newt/repo/repo.go | 2 +-
newt/target/target.go | 1 -
3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/9351ecf9/newt/project/project.go
----------------------------------------------------------------------
diff --git a/newt/project/project.go b/newt/project/project.go
index 7e3e5e1..a53fd06 100644
--- a/newt/project/project.go
+++ b/newt/project/project.go
@@ -20,6 +20,7 @@
package project
import (
+ "bufio"
"fmt"
"log"
"os"
@@ -190,9 +191,21 @@ func (proj *Project) Install(upgrade bool, force bool) error {
str += "(" + branch + ")"
}
- fmt.Printf("Would you like to upgrade repository %s from %s to %s %s",
+ fmt.Printf("Would you like to upgrade repository %s from %s to %s %s? [Yn] ",
r.Name(), vers.String(), newVers.String(), str)
+ line, more, err := bufio.NewReader(os.Stdin).ReadLine()
+ if more || err != nil {
+ return util.NewNewtError(fmt.Sprintf(
+ "Couldn't read upgrade response: %s\n", err.Error()))
+ }
+ answer := strings.ToUpper(strings.Trim(string(line), " "))
+ if answer == "N" || answer == "NO" {
+ fmt.Printf("Users says don't upgrade, skipping upgrade of %s\n",
+ r.Name())
+ continue
+ }
+
}
} else {
fmt.Printf("Repository %s doesn't need to be upgraded, latest "+
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/9351ecf9/newt/repo/repo.go
----------------------------------------------------------------------
diff --git a/newt/repo/repo.go b/newt/repo/repo.go
index 35f7507..0419e38 100644
--- a/newt/repo/repo.go
+++ b/newt/repo/repo.go
@@ -65,7 +65,7 @@ func (rd *RepoDesc) Match(r *Repo) (string, *Version, bool) {
if vers.SatisfiesVersion(r.VersionRequirements()) {
log.Printf("[DEBUG] Found matching version %s for repo %s",
vers.String(), r.Name())
- if vers.Stability() != "none" {
+ if vers.Stability() != VERSION_STABILITY_NONE {
searchVers, err := LoadVersion(branch)
if err != nil {
return "", nil, false
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/9351ecf9/newt/target/target.go
----------------------------------------------------------------------
diff --git a/newt/target/target.go b/newt/target/target.go
index 19e55ac..643035e 100644
--- a/newt/target/target.go
+++ b/newt/target/target.go
@@ -125,7 +125,6 @@ func (target *Target) App() *pkg.LocalPackage {
appPkg := project.GetProject().ResolveDependency(dep)
if appPkg == nil {
fmt.Printf("app name = %s\n", target.AppName)
- fmt.Println("dep is not resolved")
return nil
}