From 5a3394c94c224b2d1e1d17580e891144fed76545 Mon Sep 17 00:00:00 2001 From: Asish Kumar Date: Sun, 19 May 2024 10:13:06 +0530 Subject: [PATCH 1/2] fix: rename in kpm add Signed-off-by: Asish Kumar --- pkg/client/client.go | 7 ++++--- pkg/package/modfile.go | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkg/client/client.go b/pkg/client/client.go index f2f0bbd4..bc665a00 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -631,9 +631,10 @@ func (c *KpmClient) AddDepWithOpts(kclPkg *pkg.KclPkg, opt *opt.AddOptions) (*pk } // 3. update the kcl.mod and kcl.mod.lock. - if opt.NewPkgName != "" { - d.ChangePkgName(opt.NewPkgName) - } + tempDeps := kclPkg.ModFile.Dependencies.Deps[d.Name] + tempDeps.Name = opt.NewPkgName + kclPkg.ModFile.Dependencies.Deps[d.Name] = tempDeps + err = kclPkg.UpdateModAndLockFile() if err != nil { return nil, err diff --git a/pkg/package/modfile.go b/pkg/package/modfile.go index 9f5b1c23..38946a04 100644 --- a/pkg/package/modfile.go +++ b/pkg/package/modfile.go @@ -266,10 +266,6 @@ func (dep *Dependency) GetDownloadPath() string { return "" } -func (dep *Dependency) ChangePkgName(NewPkgName string) { - dep.Name = NewPkgName -} - func GenSource(sourceType string, uri string, tagName string) (Source, error) { source := Source{} if sourceType == GIT { From 3386e0f35cc4f82b37a7609d274f39dc7b2772ae Mon Sep 17 00:00:00 2001 From: Asish Kumar Date: Sun, 19 May 2024 21:31:56 +0530 Subject: [PATCH 2/2] fix: rename in kpm add Signed-off-by: Asish Kumar --- pkg/client/client.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/client/client.go b/pkg/client/client.go index bc665a00..e8b8285d 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -631,10 +631,12 @@ func (c *KpmClient) AddDepWithOpts(kclPkg *pkg.KclPkg, opt *opt.AddOptions) (*pk } // 3. update the kcl.mod and kcl.mod.lock. - tempDeps := kclPkg.ModFile.Dependencies.Deps[d.Name] - tempDeps.Name = opt.NewPkgName - kclPkg.ModFile.Dependencies.Deps[d.Name] = tempDeps - + if opt.NewPkgName != "" { + tempDeps := kclPkg.ModFile.Dependencies.Deps[d.Name] + tempDeps.Name = opt.NewPkgName + kclPkg.ModFile.Dependencies.Deps[d.Name] = tempDeps + } + err = kclPkg.UpdateModAndLockFile() if err != nil { return nil, err