Merge pull request #82 from endophage/flynnmaster

simpler NormalizeTargets
theupdateframework · May 6, 2015 · e4c2efd · e4c2efd
2 parents 0fcbe88 + ae493bc
commit e4c2efd
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/util/util.go b/util/util.go
@@ -11,7 +11,6 @@ import (
 	"io"
 	"io/ioutil"
 	"path"
-	"strings"
 
 	"github.com/flynn/go-tuf/data"
 )
@@ -105,14 +104,7 @@ func GenerateFileMeta(r io.Reader, hashAlgorithms ...string) (data.FileMeta, err
 }
 
 func NormalizeTarget(p string) string {
-	if p == "" {
-		return "/"
-	}
-	s := path.Clean(p)
-	if strings.HasPrefix(s, "/") {
-		return s
-	}
-	return "/" + s
+	return path.Join("/", p)
 }
 
 func HashedPaths(p string, hashes data.Hashes) []string {