godeps

Merge lp:~dimitern/godeps/fix-bzr-revision-info-parsing into lp:godeps

  1. fix-bzr-revision-info-parsing
  2. Merge into trunk
Proposed by Dimiter Naydenov on 2015-08-17
Status: Merged
Merged at revision: 30
Proposed branch: lp:~dimitern/godeps/fix-bzr-revision-info-parsing
Merge into: lp:godeps
Diff against target: 12 lines (+1/-1)
1 file modified
godeps.go (+1/-1)
To merge this branch: bzr merge lp:~dimitern/godeps/fix-bzr-revision-info-parsing
Reviewer Review Type Date Requested Status
godeps-maintainers 2015-08-17 Pending
Review via email: mp+268223@code.launchpad.net

Commit Message

Fixed 'bzr revision-info --tree' parsing to accept dots in revision numbers.

Description of the Change

When godeps encounters a bzr revision with dots in it in the working directory of a dependency, it returns an error:

godeps: cannot get information on "/home/dimitern/work/go/src/launchpad.net/gwacl": bzr revision-info has unexpected result "244.1.1 <email address hidden>\n"

The fix just allows dots in bzr revision number.

Related juju-core PR: http://reviews.vapour.ws/r/2377/

To post a comment you must log in.
Roger Peppe (rogpeppe) wrote :

LGTM, except the \ escape in the regexp is not necessary (dot
isn't special inside [].

Thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'godeps.go'
2--- godeps.go 2015-05-05 08:25:07 +0000
3+++ godeps.go 2015-08-17 13:21:50 +0000
4@@ -635,7 +635,7 @@
5 return "bzr"
6 }
7
8-var validBzrInfo = regexp.MustCompile(`^([0-9]+) ([^ \t]+)$`)
9+var validBzrInfo = regexp.MustCompile(`^([0-9\.]+) ([^ \t]+)$`)
10 var shelveLine = regexp.MustCompile(`^[0-9]+ (shelves exist|shelf exists)\.`)
11
12 func (bzrVCS) Info(dir string) (VCSInfo, error) {

Subscribers

People subscribed via source and target branches