Merge lp:~arjan-s/openlp/check_dependencies_fix into lp:openlp

[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]

2139. By Jonathan Corwin on 2013-01-05

Fix import of settings.

- QSettings exports the 'general' group as '%General' but appears in some circumstances (Linux?) to struggle to import this again. Try and compensate.

- Support the import of the 'players' section

- Change the setting group validation to skip those it doesn't know. Just test for an expected setting earlier instead. Also fix the error message.

[Raoul Snyman (raoul-snyman)]

There's a better way of doing this. I know Python has a built-in module that deals with version numbers, though I can't think of the name right now.

[Meinert Jordan (m2j)]

from distutils.version import StrictVersion

[lp:~arjan-s/openlp/check_dependencies_fix]

2140. By Arjan Schrijver on 2013-01-07

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

[Arjan Schrijver (arjan-s)]

m2j, thank you. 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

[Andreas Preikschat (googol-deactivatedaccount)]

NOTE: when you are working on a bug, then assign yourself to the bug. When committing your changes add --fixes lp:<bug-number> to the command line (this linnks your branch to the bug report)

=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py	2012-12-29 20:56:56 +0000
+++ scripts/check_dependencies.py	2013-01-07 09:26:21 +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)