diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-06-27 15:52:14 +0200 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-06-27 15:52:14 +0200 |
| commit | a93832c2e3058c55e183c487dde595bd42238bb0 (patch) | |
| tree | fa91d706217327210db4aadc1a8d9f3973f8a5e0 /lib/xdsserver/sdks.go | |
| parent | 7f3c55f02aa6b35b3530883a6c1f71ddd1f92eb4 (diff) | |
Fixed sdk from local file installation
Rework sdk uuid management because previous code prevented to install
local sdk using following command:
xds-cli sdks install --file $HOME/xds-workspace/my_local_sdk.sh
Change-Id: I20bac8a76d32b005a6775e936756c96048651766
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'lib/xdsserver/sdks.go')
| -rw-r--r-- | lib/xdsserver/sdks.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/xdsserver/sdks.go b/lib/xdsserver/sdks.go index 4a7ba84..ee6a269 100644 --- a/lib/xdsserver/sdks.go +++ b/lib/xdsserver/sdks.go @@ -340,7 +340,7 @@ func (s *SDKs) Install(id, filepath string, force bool, timeout int, args []stri // Update path when not set if sdk.Path == "" { - sdkDef, err := GetSDKInfo(scriptDir, sdk.URL, "", "", s.Log) + sdkDef, err := GetSDKInfo(scriptDir, sdk.URL, "", "", sdk.UUID, s.Log) if err != nil || sdkDef.Path == "" { return nil, fmt.Errorf("cannot retrieve sdk path %v", err) } @@ -356,7 +356,7 @@ func (s *SDKs) Install(id, filepath string, force bool, timeout int, args []stri } for _, sf := range s.SdksFamilies { - sdkDef, err := GetSDKInfo(sf.ScriptsDir, "", sdkFilename, "", s.Log) + sdkDef, err := GetSDKInfo(sf.ScriptsDir, "", sdkFilename, "", "", s.Log) if err == nil { // OK, sdk found sdk = &sdkDef |