veyron/lib/{modules,exec}: tidy up env var handling.
Tidy up the handling of environment variables in particular to
make working with and implementing the node manager and associated
tests easier.
The exec package now unsets the VEYRON_EXEC_VERSION env var when
it no longer needs to avoid having it be accidentally passed on
to other process that are are not necessarily started by this
package.
The modules shell type now has a 'CommandEnvelope' method that can
be used by the node manager when constructing envelopes for use
with the app manager.
Change-Id: I86a896557bdf6b87f39523fb7399453cf7d2a0fe
diff --git a/lib/exec/child.go b/lib/exec/child.go
index 8beb45a..105d0d5 100644
--- a/lib/exec/child.go
+++ b/lib/exec/child.go
@@ -9,8 +9,8 @@
)
var (
- ErrNoVersion = errors.New(versionVariable + " environment variable missing")
- ErrUnsupportedVersion = errors.New("Unsupported version of veyron/lib/exec request by " + versionVariable + " environment variable")
+ ErrNoVersion = errors.New(VersionVariable + " environment variable missing")
+ ErrUnsupportedVersion = errors.New("Unsupported version of veyron/lib/exec request by " + VersionVariable + " environment variable")
)
type ChildHandle struct {
@@ -77,10 +77,11 @@
}
func createChildHandle() (*ChildHandle, error) {
- switch os.Getenv(versionVariable) {
+ switch os.Getenv(VersionVariable) {
case "":
return nil, ErrNoVersion
case version1:
+ os.Setenv(VersionVariable, "")
// TODO(cnicolaou): need to use major.minor.build format for
// version #s.
default:
