Merge pull request #376 from dmage/master
Fallback for clonePath if `<repo>.<vcs><dir>` pattern matched
diff --git a/gosrc/vcs.go b/gosrc/vcs.go
index db0c083..6fbb545 100644
--- a/gosrc/vcs.go
+++ b/gosrc/vcs.go
@@ -269,9 +269,16 @@
}
}
+ clonePath, ok := match["clonePath"]
+ if !ok {
+ // clonePath may be unset if we're being called via the generic repo.vcs/dir regexp matcher.
+ // In that case, set it to the repo value.
+ clonePath = match["repo"]
+ }
+
// Download and checkout.
- tag, etag, err := cmd.download(schemes, match["clonePath"], match["repo"], etagSaved)
+ tag, etag, err := cmd.download(schemes, clonePath, match["repo"], etagSaved)
if err != nil {
return nil, err
}
