r18725 - in /branches/frame_order_testing: ./ info.py -- March 09, 2013 - 11:35

Author: bugman
Date: Sat Mar  9 11:35:06 2013
New Revision: 18725

URL: http://svn.gna.org/viewcvs/relax?rev=18725&view=rev
Log:
Merged revisions 18723-18724 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18723 | bugman | 2013-03-09 10:36:27 +0100 (Sat, 09 Mar 2013) | 3 lines
  
  The minfx.__version__ value is now read for the version in the relax 
information printout.
........
  r18724 | bugman | 2013-03-09 10:42:41 +0100 (Sat, 09 Mar 2013) | 3 lines
  
  The bmrblib.__version__ value is now read for the version in the relax 
information printout.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/info.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Mar  9 11:35:06 2013
@@ -1,1 +1,1 @@
-/trunk:1-18721
+/trunk:1-18724

Modified: branches/frame_order_testing/info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/info.py?rev=18725&r1=18724&r2=18725&view=diff
==============================================================================
--- branches/frame_order_testing/info.py (original)
+++ branches/frame_order_testing/info.py Sat Mar  9 11:35:06 2013
@@ -339,18 +339,22 @@
         # minfx.
         package.append('minfx')
         status.append(True)
-        version.append('Unknown')
+        if hasattr(dep_check.minfx, '__version__'):
+            version.append(dep_check.minfx.__version__)
+        else:
+            version.append('Unknown')
         path.append(dep_check.minfx.__path__[0])
 
         # bmrblib.
         package.append('bmrblib')
         status.append(dep_check.bmrblib_module)
-        try:
-            dep_check.bmrblib.__path__[0]
+        if hasattr(dep_check.bmrblib, '__version__'):
+            version.append(dep_check.bmrblib.__version__)
+        else:
             version.append('Unknown')
+        try:
             path.append(dep_check.bmrblib.__path__[0])
         except:
-            version.append('')
             path.append('')
 
         # numpy.