X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=blobdiff_plain;f=lib%2Fxdsserver%2Fsdks.go;fp=lib%2Fxdsserver%2Fsdks.go;h=9c10747c8d93b88ef5f0ce4b11dcd829ea4453bf;hp=38e380d156732a7c64d6f0912d991006f49ce843;hb=f2eecfb601acc6c67fb52bf2edda93505bc44da5;hpb=1ecdc95d837e73509243d436fcafea0920599fbe diff --git a/lib/xdsserver/sdks.go b/lib/xdsserver/sdks.go index 38e380d..9c10747 100644 --- a/lib/xdsserver/sdks.go +++ b/lib/xdsserver/sdks.go @@ -75,7 +75,8 @@ func NewSDKs(ctx *Context) (*SDKs, error) { sdksList, err := ListCrossSDK(d, s.Log) if err != nil { - return &s, err + // allow to use XDS even if error on list + s.Log.Errorf("Cannot retrieve SDK list: %v", err) } s.LogSillyf("'%s' SDKs list: %v", d, sdksList) @@ -309,9 +310,7 @@ func (s *SDKs) AbortInstall(id string, timeout int) (*xsapiv1.SDK, error) { } // Remove Used to uninstall a SDK -func (s *SDKs) Remove(id string) (*xsapiv1.SDK, error) { - s.mutex.Lock() - defer s.mutex.Unlock() +func (s *SDKs) Remove(id string, timeout int, sess *ClientSession) (*xsapiv1.SDK, error) { cSdk, exist := s.Sdks[id] if !exist { @@ -323,7 +322,7 @@ func (s *SDKs) Remove(id string) (*xsapiv1.SDK, error) { // Launch script to remove/uninstall // (note that remove event will be generated by monitoring thread) - if err := cSdk.Remove(); err != nil { + if err := cSdk.Remove(timeout, sess); err != nil { return &cSdk.sdk, err }