Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix FindUpstream command logic #731

Merged
merged 15 commits into from
Apr 4, 2023
Merged

Fix FindUpstream command logic #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5f320e0
Run golangci-lint
sverdlov93 Mar 30, 2023
e93ee8f
Run golangci-lint
sverdlov93 Mar 30, 2023
4a2ef50
Run golangci-lint
sverdlov93 Mar 30, 2023
90637aa
Fix lint issues found
sverdlov93 Apr 2, 2023
ec11347
Fix lint issues found
sverdlov93 Apr 2, 2023
9b4c1ef
Fix lint issues found
sverdlov93 Apr 3, 2023
a4c6d8e
Merge branch 'dev' of https://github.com/jfrog/jfrog-client-go into g…
sverdlov93 Apr 3, 2023
113df02
Fix lint issues found
sverdlov93 Apr 3, 2023
7349c7d
Fix lint issues found
sverdlov93 Apr 3, 2023
9f6eeb8
Merge branch 'dev' of https://github.com/jfrog/jfrog-client-go into g…
sverdlov93 Apr 3, 2023
40347d1
Fix lint issues found
sverdlov93 Apr 4, 2023
9a2799b
Merge branch 'dev' of https://github.com/jfrog/jfrog-client-go into g…
sverdlov93 Apr 4, 2023
03295e3
Fix lint issues found
sverdlov93 Apr 4, 2023
d7e5f68
Fix lint issues found
sverdlov93 Apr 4, 2023
e4a8594
Fix lint issues found
sverdlov93 Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230330091550-a452f54ba1cc
replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230403064815-ea83b399ac8e

// replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.5-0.20221107113836-a4c9225c690e
// replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.5-0.20221107113836-a4c9225c690e
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
github.com/jfrog/build-info-go v1.9.0 h1:gLxBfp4C6pVz+bKTmsqwFGZAueVMuzGw+/M9HZgtGG4=
github.com/jfrog/build-info-go v1.9.0/go.mod h1:dQ8OKddrbgtO3jK9uLYoqmRGNEjuDuNXV0bSRdpeTCI=
github.com/jfrog/build-info-go v1.8.9-0.20230403064815-ea83b399ac8e h1:MB5u0Kbq9IIDIlnpDYUq+SHTZ+/ossTOCK7z/t8S0l8=
github.com/jfrog/build-info-go v1.8.9-0.20230403064815-ea83b399ac8e/go.mod h1:HIrpwf4p4XHpAx+N+rb8SX9yrWYWs7X4rT/s0GOJfW8=
github.com/jfrog/gofrog v1.2.5 h1:jCgJC0iGQ8bU7jCC+YEFJTNINyngApIrhd8BjZAVRIE=
github.com/jfrog/gofrog v1.2.5/go.mod h1:o00tSRff6IapTgaCMuX1Cs9MH08Y1JqnsKgRtx91Gc4=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
Expand Down
5 changes: 3 additions & 2 deletions utils/io/fileutils/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,9 @@ func FindUpstream(itemToFInd string, itemType ItemType) (wd string, exists bool,
if err != nil {
return
}
origWd := wd
defer func() {
e := os.Chdir(wd)
e := os.Chdir(origWd)
if err == nil {
err = e
}
Expand Down Expand Up @@ -586,7 +587,7 @@ func FindUpstream(itemToFInd string, itemType ItemType) (wd string, exists bool,
visitedPaths[wd] = true
// CD to the parent directory.
wd = filepath.Dir(wd)
err := os.Chdir(wd)
err = os.Chdir(wd)
if err != nil {
return "", false, err
}
Expand Down