github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #950 from stevvooe/remote-path-manip

Browse Source 
cmd/dist: remove unnecessary path manipulation
This commit is contained in:
Stephen Day 2017-06-01 17:58:13 -07:00 committed by GitHub
commit 305c04154e
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/dist/common.go vendored
View File

@ -8,7 +8,6 @@ import (
"fmt" "fmt"
"net" "net"
"net/http" "net/http"
"path/filepath"
"strings" "strings"
"time" "time"
@ -56,14 +55,6 @@ func getClient(context *cli.Context) (*containerd.Client, error) {
} }
func resolveContentStore(context *cli.Context) (content.Store, error) { func resolveContentStore(context *cli.Context) (content.Store, error) {
root := filepath.Join(context.GlobalString("root"), "content")
if !filepath.IsAbs(root) {
var err error
root, err = filepath.Abs(root)
if err != nil {
return nil, err
}
}
conn, err := connectGRPC(context) conn, err := connectGRPC(context)
if err != nil { if err != nil {
return nil, err return nil, err