Skip to content

Commit dc97867

Browse files
authored
Merge pull request #483 from kcl-lang/fix-circular-dep
fix: fix a bug when check cyclic dependeny
2 parents 31d2c0f + 5ea3895 commit dc97867

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

pkg/client/client.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,12 +1895,16 @@ func (c *KpmClient) DownloadDeps(deps *pkg.Dependencies, lockDeps *pkg.Dependenc
18951895
var err error
18961896
var deppkg *pkg.KclPkg
18971897
if len(d.LocalFullPath) != 0 {
1898-
deppkg, err = c.LoadPkgFromPath(d.LocalFullPath)
1898+
if d.GetPackage() != "" {
1899+
d.LocalFullPath, _ = utils.FindPackage(d.LocalFullPath, d.GetPackage())
1900+
}
18991901
} else {
19001902
// Load kcl.mod file of the new downloaded dependencies.
1901-
deppkg, err = c.LoadPkgFromPath(filepath.Join(c.homePath, d.FullName))
1902-
1903+
if d.GetPackage() != "" {
1904+
d.LocalFullPath, _ = utils.FindPackage(filepath.Join(c.homePath, d.FullName), d.GetPackage())
1905+
}
19031906
}
1907+
deppkg, err = c.LoadPkgFromPath(d.LocalFullPath)
19041908
if err != nil {
19051909
if os.IsNotExist(err) {
19061910
continue

pkg/client/test_data/test_mod_file_package/test_pkg/kcl.mod.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[dependencies]
22
[dependencies.cc]
33
name = "cc"
4-
full_name = "flask-demo-kcl-manifests_8308200"
4+
full_name = "flask_manifests_0.0.1"
55
version = "0.0.1"
66
url = "https://github.com/kcl-lang/flask-demo-kcl-manifests.git"
77
commit = "8308200"

0 commit comments

Comments
 (0)