clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-03 20:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8782 from shuai-z/rm-clean

Browse Source 
removed redundant Clean
This commit is contained in:
Jessie Frazelle
2014-10-27 09:23:10 -07:00
parent 15b6b7be01 ce407ccff4
commit 80d35c7fd0
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/symlink/fs.go
+1 -2
View File
@@ -35,7 +35,6 @@ func FollowSymlinkInScope(link, root string) (string, error) {
for _, p := range strings.Split(link, "/") {
prev = filepath.Join(prev, p)
prev = filepath.Clean(prev)
loopCounter := 0
for {
@@ -72,7 +71,7 @@ func FollowSymlinkInScope(link, root string) (string, error) {
} else {
prev, _ = filepath.Abs(prev)
if prev = filepath.Clean(filepath.Join(filepath.Dir(prev), dest)); len(prev) < len(root) {
if prev = filepath.Join(filepath.Dir(prev), dest); len(prev) < len(root) {
prev = filepath.Join(root, filepath.Base(dest))
}
}