Changeset 2933

Timestamp:

May 19, 2006, 6:15:57 PM (19 years ago)

Author:

ole

Message:

Fixed get_version

File:

• inundation/pyvolution/util.py (modified) (1 diff)

inundation/pyvolution/util.py

@@ -507 +507 @@
     """gets the version number of the SVN
     """
+    
     import os, sys
-    
-    if sys.platform == 'win32':
-        msg = 'does not work in Windows .... yet'
-        raise OSError, msg
+
+    # Create dummy info 
+    info = 'Revision: Version info could not be obtained.'
+    info += 'A command line version of svn and access to the '
+    info += 'repository is necessary and the output must '
+    info += 'contain a line starting with "Revision:"'
+
+    try:
+        fid = os.popen('svn info')
+    except:
+        msg = 'svn is not recognised'
+        warn(msg, UserWarning)
     else:    
-        fid = os.popen('svn -info')
-        info = fid.readlines()
+        lines = fid.readlines()
         fid.close()
-        return info
+        for line in lines:
+            if line.startswith('Revision:'):
+                info = line
+                break
+       
+    return info
+    
+    #if sys.platform == 'win32':
+    #    msg = 'does not work in Windows .... yet'
+    #    raise OSError, msg
+    #else:    
+    #    fid = os.popen('svn -info')
+    #    info = fid.readlines()
+    #    fid.close()
+    #    return info