toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16945 from estesp/ocd-on-nonmatching-func-names

Browse Source 
Correct mismatched function names (UID() and Gid())
Upstream-commit: 2d1414e8b0110b2f1857adcafbb65484d5c003fd
Component: engine
This commit is contained in:
Alexander Morozov
2015-10-12 09:15:51 -07:00
parent b806f82f84 5e0687e2a2
commit ae24831060
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/volumes_unix.go
+1 -1
View File
@@ -28,7 +28,7 @@ func copyOwnership(source, destination string) error {
return err
}
if err := os.Chown(destination, int(stat.UID()), int(stat.Gid())); err != nil {
if err := os.Chown(destination, int(stat.UID()), int(stat.GID())); err != nil {
return err
}
components/engine/integration-cli/docker_cli_experimental_test.go
+1 -1
View File
@@ -80,5 +80,5 @@ func (s *DockerDaemonSuite) TestDaemonUserNamespaceRootSetting(c *check.C) {
c.Fatal(err)
}
c.Assert(stat.UID(), check.Equals, uint32(uid), check.Commentf("Touched file not owned by remapped root UID"))
c.Assert(stat.Gid(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
c.Assert(stat.GID(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
}
components/engine/pkg/archive/changes_unix.go
+1 -1
View File
@@ -12,7 +12,7 @@ func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {
// Don't look at size for dirs, its not a good measure of change
if oldStat.Mode() != newStat.Mode() ||
oldStat.UID() != newStat.UID() ||
oldStat.Gid() != newStat.Gid() ||
oldStat.GID() != newStat.GID() ||
oldStat.Rdev() != newStat.Rdev() ||
// Don't look at size for dirs, its not a good measure of change
(oldStat.Mode()&syscall.S_IFDIR != syscall.S_IFDIR &&
components/engine/pkg/system/stat.go
+2 -2
View File
@@ -27,8 +27,8 @@ func (s StatT) UID() uint32 {
return s.uid
}
// Gid returns file's group id of owner.
func (s StatT) Gid() uint32 {
// GID returns file's group id of owner.
func (s StatT) GID() uint32 {
return s.gid
}
components/engine/pkg/system/stat_unix_test.go
+1 -1
View File
@@ -27,7 +27,7 @@ func TestFromStatT(t *testing.T) {
if stat.Uid != s.UID() {
t.Fatal("got invalid uid")
}
if stat.Gid != s.Gid() {
if stat.Gid != s.GID() {
t.Fatal("got invalid gid")
}
if stat.Rdev != s.Rdev() {