diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2011-06-20 14:46:32 +1000 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2011-06-20 14:46:32 +1000 |
| commit | b7b8f2b0862061e4ca67a6157c30c0880dda9e54 (patch) | |
| tree | ff6e28de9d296f0d10092365c116bf37dfb2eb60 | |
| parent | f3a7dad6540d582c5de4bb7814fdb3a3c875fad1 (diff) | |
| download | go-b7b8f2b0862061e4ca67a6157c30c0880dda9e54.tar.gz go-b7b8f2b0862061e4ca67a6157c30c0880dda9e54.zip | |
misc/godashboard: Accept sub-directories for goinstall's report.
Fixed issue 1155.
R=golang-dev, adg, rsc
CC=golang-dev
https://golang.org/cl/4592059
| -rw-r--r-- | misc/dashboard/godashboard/package.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/misc/dashboard/godashboard/package.py b/misc/dashboard/godashboard/package.py index a1bca19087..dd09593ac1 100644 --- a/misc/dashboard/godashboard/package.py +++ b/misc/dashboard/godashboard/package.py @@ -45,7 +45,7 @@ class Project(db.Model): re_bitbucket = re.compile(r'^bitbucket\.org/[a-z0-9A-Z_.\-]+/[a-z0-9A-Z_.\-]+$') re_googlecode = re.compile(r'^[a-z0-9\-]+\.googlecode\.com/(svn|hg)$') -re_github = re.compile(r'^github\.com/[a-z0-9A-Z_.\-]+/[a-z0-9A-Z_.\-]+$') +re_github = re.compile(r'^github\.com/[a-z0-9A-Z_.\-]+(/[a-z0-9A-Z_.\-]+)+$') re_launchpad = re.compile(r'^launchpad\.net/([a-z0-9A-Z_.\-]+(/[a-z0-9A-Z_.\-]+)?|~[a-z0-9A-Z_.\-]+/(\+junk|[a-z0-9A-Z_.\-]+)/[a-z0-9A-Z_.\-]+)(/[a-z0-9A-Z_.\-/]+)?$') @@ -54,10 +54,9 @@ def vc_to_web(path): check_url = 'http://' + path + '/?cmd=heads' web = 'http://' + path + '/' elif re_github.match(path): - # github doesn't let you fetch the .git directory anymore. - # fetch .git/info/refs instead, like git clone would. - check_url = 'http://'+path+'.git/info/refs' - web = 'http://' + path + m = re_github_web.match(path) + check_url = 'https://raw.github.com/' + m.group(1) + '/' + m.group(2) + '/master/' + web = 'http://github.com/' + m.group(1) + '/' + m.group(2) elif re_googlecode.match(path): check_url = 'http://'+path web = 'http://code.google.com/p/' + path[:path.index('.')] |