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/09/09 21:35:30 UTC
incubator-mynewt-newt git commit: Update vendor directories for
mynewt.apache.org/newt/...
Repository: incubator-mynewt-newt
Updated Branches:
refs/heads/develop 904f79b15 -> 7a57c73b5
Update vendor directories for mynewt.apache.org/newt/...
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/7a57c73b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/7a57c73b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/7a57c73b
Branch: refs/heads/develop
Commit: 7a57c73b5321475c688e3e767d8d1ac48f1c37b9
Parents: 904f79b
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Sep 9 14:35:02 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Sep 9 14:35:02 2016 -0700
----------------------------------------------------------------------
newt/Godeps/Godeps.json | 14 +++++++-------
newt/vendor/mynewt.apache.org/newt/util/util.go | 5 ++++-
newtmgr/Godeps/Godeps.json | 12 ++++++------
newtmgr/vendor/mynewt.apache.org/newt/util/util.go | 5 ++++-
4 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/7a57c73b/newt/Godeps/Godeps.json
----------------------------------------------------------------------
diff --git a/newt/Godeps/Godeps.json b/newt/Godeps/Godeps.json
index b1eaaa5..cf4c345 100644
--- a/newt/Godeps/Godeps.json
+++ b/newt/Godeps/Godeps.json
@@ -1,7 +1,7 @@
{
"ImportPath": "mynewt.apache.org/newt/newt",
"GoVersion": "go1.6",
- "GodepVersion": "v58",
+ "GodepVersion": "v74",
"Deps": [
{
"ImportPath": "github.com/Sirupsen/logrus",
@@ -52,18 +52,18 @@
},
{
"ImportPath": "mynewt.apache.org/newt/util",
- "Comment": "mynewt_0_9_0_tag-63-gec4ac73",
- "Rev": "ec4ac73d832130b2eddc8a5c6ff9046edb75cb0b"
+ "Comment": "mynewt_0_9_0_rc3_tag-91-g904f79b",
+ "Rev": "904f79b15feeefe76a9e4ecc139c56fd54aa4412"
},
{
"ImportPath": "mynewt.apache.org/newt/viper",
- "Comment": "mynewt_0_9_0_tag-63-gec4ac73",
- "Rev": "ec4ac73d832130b2eddc8a5c6ff9046edb75cb0b"
+ "Comment": "mynewt_0_9_0_rc3_tag-91-g904f79b",
+ "Rev": "904f79b15feeefe76a9e4ecc139c56fd54aa4412"
},
{
"ImportPath": "mynewt.apache.org/newt/yaml",
- "Comment": "mynewt_0_9_0_tag-63-gec4ac73",
- "Rev": "ec4ac73d832130b2eddc8a5c6ff9046edb75cb0b"
+ "Comment": "mynewt_0_9_0_rc3_tag-91-g904f79b",
+ "Rev": "904f79b15feeefe76a9e4ecc139c56fd54aa4412"
}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/7a57c73b/newt/vendor/mynewt.apache.org/newt/util/util.go
----------------------------------------------------------------------
diff --git a/newt/vendor/mynewt.apache.org/newt/util/util.go b/newt/vendor/mynewt.apache.org/newt/util/util.go
index 75fc5f0..27b407c 100644
--- a/newt/vendor/mynewt.apache.org/newt/util/util.go
+++ b/newt/vendor/mynewt.apache.org/newt/util/util.go
@@ -293,7 +293,7 @@ func ShellCommand(cmdStr string) ([]byte, error) {
}
// Run interactive shell command
-func ShellInteractiveCommand(cmdStr []string) error {
+func ShellInteractiveCommand(cmdStr []string, env []string) error {
log.Print("[VERBOSE] " + cmdStr[0])
//
@@ -307,9 +307,12 @@ func ShellInteractiveCommand(cmdStr []string) error {
<-c
}()
+ env = append(env, os.Environ()...)
// Transfer stdin, stdout, and stderr to the new process
// and also set target directory for the shell to start in.
+ // and set the additional environment variables
pa := os.ProcAttr{
+ Env: env,
Files: []*os.File{os.Stdin, os.Stdout, os.Stderr},
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/7a57c73b/newtmgr/Godeps/Godeps.json
----------------------------------------------------------------------
diff --git a/newtmgr/Godeps/Godeps.json b/newtmgr/Godeps/Godeps.json
index 42d952d..ae4c5e3 100644
--- a/newtmgr/Godeps/Godeps.json
+++ b/newtmgr/Godeps/Godeps.json
@@ -96,18 +96,18 @@
},
{
"ImportPath": "mynewt.apache.org/newt/util",
- "Comment": "mynewt_0_9_0_tag-61-gc2dda8b",
- "Rev": "c2dda8b2dfda07dc2658df13bd27f12aff214880"
+ "Comment": "mynewt_0_9_0_rc3_tag-91-g904f79b",
+ "Rev": "904f79b15feeefe76a9e4ecc139c56fd54aa4412"
},
{
"ImportPath": "mynewt.apache.org/newt/viper",
- "Comment": "mynewt_0_9_0_tag-61-gc2dda8b",
- "Rev": "c2dda8b2dfda07dc2658df13bd27f12aff214880"
+ "Comment": "mynewt_0_9_0_rc3_tag-91-g904f79b",
+ "Rev": "904f79b15feeefe76a9e4ecc139c56fd54aa4412"
},
{
"ImportPath": "mynewt.apache.org/newt/yaml",
- "Comment": "mynewt_0_9_0_tag-61-gc2dda8b",
- "Rev": "c2dda8b2dfda07dc2658df13bd27f12aff214880"
+ "Comment": "mynewt_0_9_0_rc3_tag-91-g904f79b",
+ "Rev": "904f79b15feeefe76a9e4ecc139c56fd54aa4412"
}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/7a57c73b/newtmgr/vendor/mynewt.apache.org/newt/util/util.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/mynewt.apache.org/newt/util/util.go b/newtmgr/vendor/mynewt.apache.org/newt/util/util.go
index 75fc5f0..27b407c 100644
--- a/newtmgr/vendor/mynewt.apache.org/newt/util/util.go
+++ b/newtmgr/vendor/mynewt.apache.org/newt/util/util.go
@@ -293,7 +293,7 @@ func ShellCommand(cmdStr string) ([]byte, error) {
}
// Run interactive shell command
-func ShellInteractiveCommand(cmdStr []string) error {
+func ShellInteractiveCommand(cmdStr []string, env []string) error {
log.Print("[VERBOSE] " + cmdStr[0])
//
@@ -307,9 +307,12 @@ func ShellInteractiveCommand(cmdStr []string) error {
<-c
}()
+ env = append(env, os.Environ()...)
// Transfer stdin, stdout, and stderr to the new process
// and also set target directory for the shell to start in.
+ // and set the additional environment variables
pa := os.ProcAttr{
+ Env: env,
Files: []*os.File{os.Stdin, os.Stdout, os.Stderr},
}