From 672e9a2f61491c6ae1cf257684aee20dc6a0d9de Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 15 Mar 2017 19:43:25 -0700 Subject: [PATCH] Fix module validation without base branch. --- test/sanity/validate-modules/validate-modules | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/sanity/validate-modules/validate-modules b/test/sanity/validate-modules/validate-modules index d79a06c5a62..7a460e16305 100755 --- a/test/sanity/validate-modules/validate-modules +++ b/test/sanity/validate-modules/validate-modules @@ -1002,12 +1002,16 @@ class GitCache(object): def __init__(self, base_branch): self.base_branch = base_branch - self.base_tree = self._git(['ls-tree', '-r', '--name-only', self.base_branch, 'lib/ansible/modules/']) + if self.base_branch: + self.base_tree = self._git(['ls-tree', '-r', '--name-only', self.base_branch, 'lib/ansible/modules/']) + else: + self.base_tree = [] + self.head_tree = self._git(['ls-tree', '-r', '--name-only', 'HEAD', 'lib/ansible/modules/']) self.base_module_paths = dict((os.path.basename(p), p) for p in self.base_tree if os.path.splitext(p)[1] in ('.py', '.ps1')) - del self.base_module_paths['__init__.py'] + self.base_module_paths.pop('__init__.py', None) self.head_aliased_modules = set()