Skip to content

Commit

Permalink
fixes #1107
Browse files Browse the repository at this point in the history
Signed-off-by: Tan Jiang <jiangd@vmware.com>
  • Loading branch information
reasonerjt committed Mar 6, 2017
1 parent c04e3e6 commit 9d5bb19
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cmd/notary/tuf.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"net/http"
"net/url"
"os"
"path"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -883,7 +884,7 @@ func tokenAuth(trustServerURL string, baseTransport *http.Transport, gun data.GU
if endpoint.Scheme == "" {
return nil, fmt.Errorf("Trust server url has to be in the form of http(s)://URL:PORT. Got: %s", trustServerURL)
}
subPath, err := url.Parse("v2/")
subPath, err := url.Parse(path.Join(endpoint.Path, "/v2/"))
if err != nil {
return nil, fmt.Errorf("Failed to parse v2 subpath. This error should not have been reached. Please report it as an issue at https://github.com/docker/notary/issues: %s", err.Error())
}
Expand Down

0 comments on commit 9d5bb19

Please sign in to comment.