galaxy: fix AttributeError on empty requirements.yml (ansible#66726)

* galaxy: fix AttributeError on empty requirements.yml * add changelog
juanje · Jan 23, 2020 · 9e8fb5b · 9e8fb5b
1 parent 5c721e8
commit 9e8fb5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelogs/fragments/66726-galaxy-fix-attribute-error.yml b/changelogs/fragments/66726-galaxy-fix-attribute-error.yml
@@ -0,0 +1,2 @@
+bugfixes:
+    - galaxy - Fix an AttributeError on ansible-galaxy install with an empty requirements.yml (https://github.com/ansible/ansible/issues/66725).
diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py
@@ -428,7 +428,7 @@ def _parse_requirements_file(self, requirements_file, allow_old_format=True):
                     "Failed to parse the requirements yml at '%s' with the following error:\n%s"
                     % (to_native(requirements_file), to_native(err)))
 
-        if requirements_file is None:
+        if file_requirements is None:
             raise AnsibleError("No requirements found in file '%s'" % to_native(requirements_file))
 
         def parse_role_req(requirement):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- galaxy - Fix an AttributeError on ansible-galaxy install with an empty requirements.yml (https://github.com/ansible/ansible/issues/66725).