Merge pull request #9331 from marcinpraczko/devel

Fix detecting distribution release on OpenSuSE
10 years ago · bdf3ec1e21
parent c930ee4747 1917906dd6
commit bdf3ec1e21
1 changed files with 5 additions and 4 deletions
--- a/lib/ansible/module_utils/facts.py
+++ b/lib/ansible/module_utils/facts.py
@ -328,10 +328,11 @@ class Facts(object):
                                    break
                            elif path == '/etc/SuSE-release':
                                data = data.splitlines()
-                                release = re.search('CODENAME *= *([^\n]+)\n', data)
-                                if release:
-                                    self.facts['distribution_release'] = release.groups()[0].strip()
-                                    break
+                                for line in data:
+                                    release = re.search('CODENAME *= *([^\n]+)', line)
+                                    if release:
+                                        self.facts['distribution_release'] = release.groups()[0].strip()
+                                        break
                    elif name == 'Debian':
                        data = get_file_content(path)
                        if 'Debian' in data: