[LNT] r227360 - [lnttool] Compare parse version strings, to handle canonical version forms.

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jan 28 14:02:52 2015
New Revision: 227360

URL: http://llvm.org/viewvc/llvm-project?rev=227360&view=rev
Log:
[lnttool] Compare parse version strings, to handle canonical version forms.

 - In some cases, the reported version will be a canonical one like "0.4.1dev0"
   which should compare equal to "0.4.1dev" according to PEP 440.

Modified:
    lnt/trunk/lnt/lnttool/main.py

Modified: lnt/trunk/lnt/lnttool/main.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/lnttool/main.py?rev=227360&r1=227359&r2=227360&view=diff
==============================================================================
--- lnt/trunk/lnt/lnttool/main.py (original)
+++ lnt/trunk/lnt/lnttool/main.py Wed Jan 28 14:02:52 2015
@@ -436,7 +436,8 @@ def _version_check():
     installed_dist_name = "%s %s" % (installed_dist.project_name,
                                      installed_dist.version)
     current_dist_name = "LNT %s" % (lnt.__version__,)
-    if installed_dist_name != current_dist_name:
+    if pkg_resources.parse_version(installed_dist_name) != \
+         pkg_resources.parse_version(current_dist_name):
         raise SystemExit("""\
 error: installed distribution %s is not current (%s), you may need to reinstall
 LNT or rerun 'setup.py develop' if using development mode.""" % (