fixes for boilerplate

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown 2017-12-01 16:21:57 -06:00
parent cad87243e1
commit 4c7974fe97

View File

@ -33,12 +33,12 @@ parser.add_argument(
nargs='*') nargs='*')
# Rootdir defaults to the directory **above** the hack/repo-infra dir. # Rootdir defaults to the directory **above** the hack/repo-infra dir.
rootdir = os.path.dirname(__file__) + "/../../../../" rootdir = os.path.dirname(__file__) + "/../../"
rootdir = os.path.abspath(rootdir) rootdir = os.path.abspath(rootdir)
parser.add_argument( parser.add_argument(
"--rootdir", default=rootdir, help="root directory to examine") "--rootdir", default=rootdir, help="root directory to examine")
default_boilerplate_dir = os.path.join(rootdir, "hack/repo-infra/verify/boilerplate") default_boilerplate_dir = os.path.join(rootdir, "hack/boilerplate")
parser.add_argument( parser.add_argument(
"--boilerplate-dir", default=default_boilerplate_dir) "--boilerplate-dir", default=default_boilerplate_dir)
@ -133,7 +133,7 @@ def file_extension(filename):
skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git', skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git',
'cluster/env.sh', 'vendor', 'test/e2e/generated/bindata.go', 'cluster/env.sh', 'vendor', 'test/e2e/generated/bindata.go',
'hack/repo-infra/verify/boilerplate/test', '.glide'] 'hack/boilerplate/test', '.glide']
def normalize_files(files): def normalize_files(files):
newfiles = [] newfiles = []