Filter apt-config dump output for precise

Filter apt-config dump output for precise

In precise, apt-config dump ignores the extra arguments and dumps all
available config keys, so filter them with a regexp before returning them from
the AptConfigProxy function. Fixes LP:1210551.

https://code.launchpad.net/~sidnei/juju-core/apt-config-precise-host/+merge/179710

(do not edit description out of merge proposal)

[sidnei.da.silva, 2013-08-12 13:59:45]

Please take a look.

[dimitern, 2013-08-12 14:04:06]

LGTM with one comment

https://codereview.appspot.com/12758044/diff/1/utils/apt.go
File utils/apt.go (right):

https://codereview.appspot.com/12758044/diff/1/utils/apt.go#newcode13
utils/apt.go:13: "launchpad.net/juju-core/log"
You don't need this when you're using loggo. Please convert all instances of
log.X to aptLogger.X.

[sidnei.da.silva, 2013-08-12 14:23:33]

Please take a look.

[rog, 2013-08-12 15:07:43]

LGTM with a possible simplification below.

https://codereview.appspot.com/12758044/diff/6001/utils/apt.go
File utils/apt.go (right):

https://codereview.appspot.com/12758044/diff/6001/utils/apt.go#newcode69
utils/apt.go:69: aptLogger.Errorf("utils/apt: apt-config command failed:
%v\nargs: %#v\n%s",
We don't need the utils/apt: prefix here any more.

https://codereview.appspot.com/12758044/diff/6001/utils/apt.go#newcode72
utils/apt.go:72: }
Alternatively, I think you may be able to replace all
the below code with something like this:

return string(bytes.Join(aptProxyRE.FindAll(out, -1), []byte("\n")))

(You might need to use FindAllSubmatch if extra white
space is a problem)

https://codereview.appspot.com/12758044/diff/6001/utils/apt.go#newcode77
utils/apt.go:77: line = strings.TrimSpace(line)
We could probably make the regexp do this job too.

[sidnei.da.silva, 2013-08-12 15:34:55]

Please take a look.

https://codereview.appspot.com/12758044/diff/1/utils/apt.go
File utils/apt.go (right):

https://codereview.appspot.com/12758044/diff/1/utils/apt.go#newcode13
utils/apt.go:13: "launchpad.net/juju-core/log"
On 2013/08/12 14:04:06, dimitern wrote:
> You don't need this when you're using loggo. Please convert all instances of
> log.X to aptLogger.X.

Done.

https://codereview.appspot.com/12758044/diff/6001/utils/apt.go
File utils/apt.go (right):

https://codereview.appspot.com/12758044/diff/6001/utils/apt.go#newcode69
utils/apt.go:69: aptLogger.Errorf("utils/apt: apt-config command failed:
%v\nargs: %#v\n%s",
On 2013/08/12 15:07:44, rog wrote:
> We don't need the utils/apt: prefix here any more.

Done.

https://codereview.appspot.com/12758044/diff/6001/utils/apt.go#newcode72
utils/apt.go:72: }
On 2013/08/12 15:07:44, rog wrote:
> Alternatively, I think you may be able to replace all
> the below code with something like this:
> 
> return string(bytes.Join(aptProxyRE.FindAll(out, -1), []byte("\n")))
> 
> (You might need to use FindAllSubmatch if extra white
> space is a problem)

Done.

https://codereview.appspot.com/12758044/diff/6001/utils/apt.go#newcode77
utils/apt.go:77: line = strings.TrimSpace(line)
On 2013/08/12 15:07:44, rog wrote:
> We could probably make the regexp do this job too.

Done.