Merge branch 'devel' into devel_switch_v2

This commit is contained in:
James Cammarata 2015-06-01 16:53:15 -05:00
commit e547e1f9ba
8 changed files with 125 additions and 6 deletions

View file

@ -423,7 +423,7 @@ class Facts(object):
release = re.search("PRETTY_NAME=[^(]+ \(?([^)]+?)\)", data)
if release:
self.facts['distribution_release'] = release.groups()[0]
break
break
elif name == 'Mandriva':
data = get_file_content(path)
if 'Mandriva' in data: