Update .gitreview file

[src/xds/xds-cli.git] / cmd-exec.go

diff --git a/cmd-exec.go b/cmd-exec.go
index c988f95..98ceb78 100644 (file)
--- a/cmd-exec.go
+++ b/cmd-exec.go
@@ -48,6 +48,12 @@ func initCmdExec(cmdDef *[]cli.Command) {
                                EnvVar: "XDS_SDK_ID",
                                Usage:  "Cross Sdk ID to use to build project",
                        },
+                       cli.BoolFlag{
+                               Name:   "ldlibpath-no-reset",
+                               Hidden: true,
+                               EnvVar: "XDS_LD_LIBRARY_PATH_NO_RESET",
+                               Usage:  "Don't reset LD_LIBRARY_PATH before executing command",
+                       },
                },
        })
 }
@@ -144,13 +150,14 @@ func execCmd(ctx *cli.Context) error {
 
        // Send build command
        args := xaapiv1.ExecArgs{
-               ID:         prjID,
-               SdkID:      sdkid,
-               Cmd:        strings.Trim(argsCommand[0], " "),
-               Args:       argsCommand[1:],
-               Env:        env,
-               RPath:      rPath,
-               CmdTimeout: 60,
+               ID:               prjID,
+               SdkID:            sdkid,
+               Cmd:              strings.Trim(argsCommand[0], " "),
+               Args:             argsCommand[1:],
+               Env:              env,
+               RPath:            rPath,
+               LdLibPathNoReset: ctx.Bool("ldlibpath-no-reset"),
+               CmdTimeout:       60,
        }
 
        LogPost("POST /exec %v", args)
@@ -160,6 +167,10 @@ func execCmd(ctx *cli.Context) error {
 
        // Wait exit
        select {
+       case res := <-IOSkClient.ServerDiscoChan:
+               Log.Debugf("XDS Server disconnected %v", res)
+               return cli.NewExitError(res.error, res.code)
+
        case res := <-exitChan:
                errStr := ""
                if res.code == 0 {