r20395 - in /branches/relax_disp: ./ info.py -- July 18, 2013 - 18:27

Author: bugman
Date: Thu Jul 18 18:27:39 2013
New Revision: 20395

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

........
  r20391 | bugman | 2013-07-18 16:13:42 +0200 (Thu, 18 Jul 2013) | 3 lines
  
  The relax info printout now works in the absence of the bmrblib module.
........

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

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 18 18:27:39 2013
@@ -1,1 +1,1 @@
-/trunk:1-20387
+/trunk:1-20394

Modified: branches/relax_disp/info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/info.py?rev=20395&r1=20394&r2=20395&view=diff
==============================================================================
--- branches/relax_disp/info.py (original)
+++ branches/relax_disp/info.py Thu Jul 18 18:27:39 2013
@@ -358,10 +358,13 @@
         # bmrblib.
         package.append('bmrblib')
         status.append(dep_check.bmrblib_module)
-        if hasattr(dep_check.bmrblib, '__version__'):
-            version.append(dep_check.bmrblib.__version__)
-        else:
-            version.append('Unknown')
+        try:
+            if hasattr(dep_check.bmrblib, '__version__'):
+                version.append(dep_check.bmrblib.__version__)
+            else:
+                version.append('Unknown')
+        except:
+            version.append('')
         try:
             path.append(dep_check.bmrblib.__path__[0])
         except: