From e34f562a77276516b81756e9ea620a1625c49093 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Thu, 30 Jul 2015 08:58:54 +0800 Subject: [PATCH] Add back golint for daemon/execdriver/native It's broken by #15099 Fix it. Signed-off-by: Qiang Huang --- daemon/execdriver/native/driver.go | 4 ++-- hack/make/validate-lint | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index 8bb00384e1..a6e0749ed6 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -58,11 +58,11 @@ func NewDriver(root, initPath string, options []string) (*Driver, error) { if apparmor.IsEnabled() { if err := installAppArmorProfile(); err != nil { - apparmor_profiles := []string{"docker-default", "docker-unconfined"} + apparmorProfiles := []string{"docker-default", "docker-unconfined"} // Allow daemon to run if loading failed, but are active // (possibly through another run, manually, or via system startup) - for _, policy := range apparmor_profiles { + for _, policy := range apparmorProfiles { if err := hasAppArmorProfileLoaded(policy); err != nil { return nil, fmt.Errorf("AppArmor enabled on system but the %s profile could not be loaded.", policy) } diff --git a/hack/make/validate-lint b/hack/make/validate-lint index 874919f500..5f1870d2a2 100644 --- a/hack/make/validate-lint +++ b/hack/make/validate-lint @@ -19,6 +19,7 @@ packages=( daemon/execdriver daemon/execdriver/execdrivers daemon/execdriver/lxc + daemon/execdriver/native daemon/execdriver/native/template daemon/graphdriver/aufs daemon/graphdriver/devmapper