/snapd

interfaces/builtin: quote apparmor label #1117

Merged
merged 1 commit into from May 4, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@zyga @mvo5 @jdstrand @niemeyer
@zyga
Contributor

zyga commented May 3, 2016

This patch adds double quotes around the apparmor label. Testing
uncovered that we should do this to make apparmor_parser happy.

Signed-off-by: Zygmunt Krynicki zygmunt.krynicki@canonical.com
@zyga
interfaces/builtin: quote apparmor label 
This patch adds double quotes around the apparmor label. Testing
uncovered that we should do this to make apparmor_parser happy.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

All checks have passed

4 successful checks
@snappy-m-o
Integration tests — Success
Details
@snappy-m-o
autopkgtest — Success
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage increased (+0.002%) to 79.341%
Details
9729f0e
interfaces/builtin/utils.go
@@ -36,7 +36,7 @@ import (
// - "snap.$snap.*" if all apps are bound to the slot
func slotAppLabelExpr(slot *interfaces.Slot) []byte {
var buf bytes.Buffer
- fmt.Fprintf(&buf, "snap.%s.", slot.Snap.Name())
+ fmt.Fprintf(&buf, `"snap.%s.`, slot.Snap.Name())
@mvo5

mvo5 May 3, 2016

Collaborator

Is there a closing " missing here?

@zyga

zyga May 3, 2016 •
Edited 1 time

Contributor

The closing one is added at the end (of the function)

@mvo5

mvo5 May 3, 2016

Collaborator

Aha! Thanks.

@mvo5
Collaborator

mvo5 commented May 3, 2016

Looks good - but I wonder if we should have a test for slotAppLabelExpr() if the " is missing here.
@zyga
Contributor

zyga commented May 3, 2016

Yeah, I'll add a test that ensures we don't forget the trailing "

@zyga zyga referenced this pull request May 3, 2016

Merged

interfaces/builtin: add location interface #1118

@jdstrand
Contributor

jdstrand commented May 3, 2016

LGTM, thanks!

@niemeyer niemeyer merged commit 348896d into snapcore:master May 4, 2016
4 checks passed

4 checks passed

Integration tests Success
Details
autopkgtest Success
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.002%) to 79.341%
Details

@zyga zyga deleted the zyga:fix-aa-label branch Dec 12, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment