Merge branch 'obsd-fix-release' of https://github.com/johanwiren/ansible into johanwiren-obsd-fix-release

13 years ago · 301a00ccf5
parent 478c400817 e9554e5da2
commit 301a00ccf5
1 changed files with 3 additions and 3 deletions
--- a/library/system/setup
+++ b/library/system/setup
@ -274,9 +274,9 @@ class Facts(object):
            self.facts['distribution'] = 'OpenBSD'
            self.facts['distribution_release'] = platform.release()
            rc, out, err = module.run_command("/sbin/sysctl -n kern.version")
-            data = re.search('OpenBSD\s[0-9]+.[0-9]+(-\S+)?\s.*', out)
-            if data:
-                self.facts['distribution_version'] = data.groups()[0][1:]
+            match = re.match('OpenBSD\s[0-9]+.[0-9]+-(\S+)\s.*', out)
+            if match:
+                self.facts['distribution_version'] = match.groups()[0]
            else:
                self.facts['distribution_version'] = 'release'
        else: