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.

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

Partial revert of sys: windows: use golang.org/x/sys/windows #4095

Merged
merged 1 commit into from Mar 9, 2020

Conversation

thaJeztah
Copy link
Member

reverts some changes from #4093

  • preserve syscall.ENOTDIR to match os.MkDirAll
  • change back parameter name to adminAndLocalSystem
  • revert accidental change of permissions of parent-dir 😓 (my bad)

see the discussion on moby/moby#40645 (comment)

- preserve `syscall.ENOTDIR` to match os.MkDirAll
- change back parameter name to `adminAndLocalSystem`
- revert accidental change of permissions of parent-dir

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Mar 9, 2020

Build succeeded.

@crosbymichael
Copy link
Member

LGTM

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov-io
Copy link

codecov-io commented Mar 9, 2020

Codecov Report

Merging #4095 into master will increase coverage by 4.32%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4095      +/-   ##
==========================================
+ Coverage   38.22%   42.55%   +4.32%     
==========================================
  Files          88      129      +41     
  Lines       12372    14822    +2450     
==========================================
+ Hits         4729     6307    +1578     
- Misses       6998     7596     +598     
- Partials      645      919     +274
Flag Coverage Δ
#linux 45.91% <ø> (?)
#windows 38.22% <ø> (ø) ⬆️
Impacted Files Coverage Δ
mount/temp_unix.go 0% <0%> (ø)
sys/reaper_linux.go 0% <0%> (ø)
services/server/server_linux.go 0% <0%> (ø)
sys/env.go 100% <0%> (ø)
snapshots/devmapper/snapshotter.go 66.39% <0%> (ø)
sys/stat_unix.go 0% <0%> (ø)
runtime/v2/shim/shim_unix.go 0% <0%> (ø)
sys/reaper.go 0% <0%> (ø)
oci/spec_opts_linux.go 0% <0%> (ø)
sys/fds.go 0% <0%> (ø)
... and 40 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9ec579b...6320236. Read the comment docs.

@crosbymichael crosbymichael merged commit 4eb9d15 into containerd:master Mar 9, 2020
@thaJeztah thaJeztah deleted the partial_revert branch March 9, 2020 22:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants