X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmd-sdks.go;h=34f5409341349550a32c8ea1b829dd699daf2fc5;hb=75fbc67b5acf3258b604fc53ec096f46fc743270;hp=4bc5a738a7ee3f502dfb1dcebd41c196f896fdde;hpb=7d1bcb1c9a48514e0e26246b86c8597502833b4b;p=src%2Fxds%2Fxds-cli.git diff --git a/cmd-sdks.go b/cmd-sdks.go index 4bc5a73..34f5409 100644 --- a/cmd-sdks.go +++ b/cmd-sdks.go @@ -156,7 +156,9 @@ func _displaySdks(sdks []xaapiv1.SDK, verbose bool, all bool, filter string) { first := true writer := NewTableWriter() for _, s := range sdks { - if s.Status != xaapiv1.SdkStatusInstalled && !all { + if s.Status != xaapiv1.SdkStatusInstalled && + s.Status != xaapiv1.SdkStatusInstalling && + !all { continue } if filter != "" { @@ -233,13 +235,18 @@ func sdksInstall(ctx *cli.Context) error { exitChan <- exitResult{errMsg, 2} }) - IOsk.On(xaapiv1.EVTSDKInstall, func(ev xaapiv1.EventMsg) { - sdkEvt, _ := ev.DecodeSDKMsg() + IOsk.On(xaapiv1.EVTSDKManagement, func(ev xaapiv1.EventMsg) { + sdkEvt, _ := ev.DecodeSDKMgtMsg() - if sdkEvt.Stdout != "" { + if sdkEvt.Action != xaapiv1.SdkMgtActionInstall { + Log.Debugf("EVTSDKManagement (action %s) IGNORED", sdkEvt.Action) + return + } + + if !shortOut && sdkEvt.Stdout != "" { fmt.Printf("%s", sdkEvt.Stdout) } - if sdkEvt.Stderr != "" { + if !shortOut && sdkEvt.Stderr != "" { fmt.Fprintf(os.Stderr, "%s", sdkEvt.Stderr) } @@ -248,7 +255,12 @@ func sdksInstall(ctx *cli.Context) error { } }) - evReg := xaapiv1.EventRegisterArgs{Name: xaapiv1.EVTSDKInstall} + IOsk.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) { + sdk, _ := ev.DecodeSDKEvent() + Log.Debugf("EVTSDKStateChange: %v", sdk) + }) + + evReg := xaapiv1.EventRegisterArgs{Name: xaapiv1.EVTAll} if err := HTTPCli.Post("/events/register", &evReg, nil); err != nil { return cli.NewExitError(err, 1) }