charm: local repos follow symlinks in series dirs

charm: local repos follow symlinks in series dirs

fixes lp:1129319

https://code.launchpad.net/~fwereade/juju-core/fix-1129319/+merge/169625

(do not edit description out of merge proposal)

[fwereade, 2013-06-15 14:49:49]

Please take a look.

[dave_cheney.net, 2013-06-17 07:18:25]

On 2013/06/15 14:49:49, fwereade wrote:
> Please take a look.

LGTM.

[dave_cheney.net, 2013-06-17 07:18:30]

https://codereview.appspot.com/10302043/diff/1/charm/repo.go
File charm/repo.go (right):

https://codereview.appspot.com/10302043/diff/1/charm/repo.go#newcode299
charm/repo.go:299: repoName := info.Name()
move below the if block

https://codereview.appspot.com/10302043/diff/1/charm/repo.go#newcode301
charm/repo.go:301: var err error
delete

https://codereview.appspot.com/10302043/diff/1/charm/repo.go#newcode302
charm/repo.go:302: if chPath, err = os.Readlink(chPath); err != nil {
if chPath, err := ...

https://codereview.appspot.com/10302043/diff/1/charm/repo.go#newcode305
charm/repo.go:305: if info, err = os.Stat(chPath); err != nil {
same

[mue, 2013-06-18 10:33:12]

LGTM, including Daves comments.

[fwereade, 2013-06-19 11:53:15]

Please take a look.

https://codereview.appspot.com/10302043/diff/1/charm/repo.go
File charm/repo.go (right):

https://codereview.appspot.com/10302043/diff/1/charm/repo.go#newcode299
charm/repo.go:299: repoName := info.Name()
On 2013/06/17 07:18:30, dfc wrote:
> move below the if block

The if block might change what info points to; what I care about here is the
name inside the series dir. I'm not going to get hung up on the name of what's
pointed to, just on whether what it is matches what we expect from looking at
the link name.

https://codereview.appspot.com/10302043/diff/1/charm/repo.go#newcode302
charm/repo.go:302: if chPath, err = os.Readlink(chPath); err != nil {
On 2013/06/17 07:18:30, dfc wrote:
> if chPath, err := ...

I need chPath just below.

https://codereview.appspot.com/10302043/diff/1/charm/repo.go#newcode305
charm/repo.go:305: if info, err = os.Stat(chPath); err != nil {
On 2013/06/17 07:18:30, dfc wrote:
> same

I need info just below.

...but I can do all this simpler. Bah.

[mue, 2013-06-19 12:03:56]

Nice, LGTM.