internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate cli and dependencies to use global display

Browse Source
This commit is contained in:
Toshio Kuratomi
2015-11-10 11:40:55 -08:00
parent 1b7d3f2898
commit 318bfbb207
12 changed files with 167 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ansible/galaxy/__init__.py
View File

@@ -28,7 +28,6 @@ import os
from ansible.compat.six import string_types
from ansible.errors import AnsibleError
from ansible.utils.display import Display
# default_readme_template
# default_meta_template
@@ -37,12 +36,7 @@ from ansible.utils.display import Display
class Galaxy(object):
''' Keeps global galaxy info '''
def __init__(self, options, display=None):
if display is None:
self.display = Display()
else:
self.display = display
def __init__(self, options):
self.options = options
roles_paths = getattr(self.options, 'roles_path', [])
@@ -65,11 +59,9 @@ class Galaxy(object):
def remove_role(self, role_name):
del self.roles[role_name]
def _str_from_data_file(self, filename):
myfile = os.path.join(self.DATA_PATH, filename)
try:
return open(myfile).read()
except Exception as e:
raise AnsibleError("Could not open %s: %s" % (filename, str(e)))