Changeset 7483

Timestamp:

Sep 4, 2009, 4:16:51 PM (15 years ago)

Author:

ole

Message:

Fixed bug in get_revision_number arising from wrong parsing of output
from svnversion committed in changeset:6860
This used to work before!!!!

File:

• anuga_core/source/anuga/utilities/system_tools.py (modified) (3 diffs)

anuga_core/source/anuga/utilities/system_tools.py

@@ -11 +11 @@
 import getpass
 import tarfile
+import warnings
+
 try:
     import hashlib
@@ -67 +69 @@
 
     def get_revision_from_svn_entries():
-        '''Get a subversion revision number from the .svn/entires file.'''
+        '''Get a subversion revision number from the .svn/entries file.'''
 
         msg = '''
@@ -140 +142 @@
                     return get_revision_from_svn_entries()
 
-            # split revision number from data
+            # Split revision number from data
             if ':' in version_info:
-                (_, revision_number) =  version_info.split(':')
-            elif version_info.endswith('M'):
-                revision_number = version_info[:-1]
+                revision_number, _ = version_info.split(':',1)
+                msg = ('Some modules have not been checked in. '
+                       'Using last version from repository: %s' % revision_number)
+                warnings.warn(msg)
             else:
                 revision_number = version_info