Merge lp:~arjan-s/openlp/check_dependencies_fix_2.0 into lp:openlp/2.0

[Arjan Schrijver]

fixed bug #1095699 'check_dependencies.py fails on version numbers with letters'
When version numbers are of type 'str', everything after the first non-numerical character is dropped, so '0.8.0b2' becomes '0.8.0'.

[lp:~arjan-s/openlp/check_dependencies_fix_2.0]

2126. By Arjan Schrijver on 2013-01-07

fixed bug #1095699 'check_dependencies.py fails on version numbers with letters'

[Arjan Schrijver (arjan-s)]

I've updated the branch with the correct fix. I used LooseVersion instead of StrictVersion because the Python version on my machine (2.7.3.final.0) is not correct according to StrictVersion.

[Raoul Snyman (raoul-snyman)]

review: Approve

[Andreas Preikschat (googol-deactivatedaccount)]

review: Approve

=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py	2012-12-30 19:41:24 +0000
+++ scripts/check_dependencies.py	2013-01-07 09:26:22 +0000
@@ -38,6 +38,7 @@
 """
 import os
 import sys
+from distutils.version import LooseVersion
 
 is_win = sys.platform.startswith('win')
 
@@ -89,15 +90,13 @@
 w = sys.stdout.write
 
 def check_vers(version, required, text):
-    if type(version) is str:
-        version = version.split('.')
-        version = map(int, version)
-    if type(required) is str:
-        required = required.split('.')
-        required = map(int, required)
-    w('  %s >= %s ...    ' % (text, '.'.join(map(str, required))))
-    if version >= required:
-        w('.'.join(map(str, version)) + os.linesep)
+    if type(version) is not str:
+        version = '.'.join(map(str, version))
+    if type(required) is not str:
+        required = '.'.join(map(str, required))
+    w('  %s >= %s ...    ' % (text, required))
+    if LooseVersion(version) >= LooseVersion(required):
+        w(version + os.linesep)
         return True
     else:
         w('FAIL' + os.linesep)