gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: r201624 - in /gump/trunk/python/gump/core/update: cvs.py p4.py svn.py
Date Fri, 24 Jun 2005 14:32:04 GMT
Author: ajack
Date: Fri Jun 24 07:32:03 2005
New Revision: 201624

URL: http://svn.apache.org/viewcvs?rev=201624&view=rev
Log:
Make an SCM update failure a module failure (even if we have a stale copy.)

Modified:
    gump/trunk/python/gump/core/update/cvs.py
    gump/trunk/python/gump/core/update/p4.py
    gump/trunk/python/gump/core/update/svn.py

Modified: gump/trunk/python/gump/core/update/cvs.py
URL: http://svn.apache.org/viewcvs/gump/trunk/python/gump/core/update/cvs.py?rev=201624&r1=201623&r2=201624&view=diff
==============================================================================
--- gump/trunk/python/gump/core/update/cvs.py (original)
+++ gump/trunk/python/gump/core/update/cvs.py Fri Jun 24 07:32:03 2005
@@ -124,18 +124,7 @@
         if not cmdResult.isOk():              
             log.error('Failed w/ CVS Root ' + root + ' for %s on Repository %s.' \
                 % (module.name, module.repository.getName())) 
-            if not exists:     
-                module.changeState(STATE_FAILED,REASON_UPDATE_FAILED)
-            else:
-                module.addError('*** Failed to update from source control. Stale contents
***')
-                        
-                # Black mark for this repository
-                repository=module.getRepository()
-                repository.addError('*** Failed to update %s from source control. Stale contents
***'	\
-                                    % module.getName())
-                                        
-                # Kinda bogus, but better than nowt (for now)
-                module.changeState(STATE_SUCCESS,REASON_UPDATE_FAILED)
+            module.changeState(STATE_FAILED,REASON_UPDATE_FAILED)
         else:
             module.changeState(STATE_SUCCESS)      
             

Modified: gump/trunk/python/gump/core/update/p4.py
URL: http://svn.apache.org/viewcvs/gump/trunk/python/gump/core/update/p4.py?rev=201624&r1=201623&r2=201624&view=diff
==============================================================================
--- gump/trunk/python/gump/core/update/p4.py (original)
+++ gump/trunk/python/gump/core/update/p4.py Fri Jun 24 07:32:03 2005
@@ -122,18 +122,7 @@
         if not cmdResult.isOk():              
             log.error('Failed w/ P4 Root ' + root + ' for %s on Repository %s.' \
                 % (module.name, module.repository.getName())) 
-            if not exists:     
-                module.changeState(STATE_FAILED,REASON_UPDATE_FAILED)
-            else:
-                module.addError('*** Failed to update from source control. Stale contents
***')
-                        
-                # Black mark for this repository
-                repository=module.getRepository()
-                repository.addError('*** Failed to update %s from source control. Stale contents
***'	\
-                                    % module.getName())
-                                        
-                # Kinda bogus, but better than nowt (for now)
-                module.changeState(STATE_SUCCESS,REASON_UPDATE_FAILED)
+            module.changeState(STATE_FAILED,REASON_UPDATE_FAILED)
         else:
             module.changeState(STATE_SUCCESS)      
             

Modified: gump/trunk/python/gump/core/update/svn.py
URL: http://svn.apache.org/viewcvs/gump/trunk/python/gump/core/update/svn.py?rev=201624&r1=201623&r2=201624&view=diff
==============================================================================
--- gump/trunk/python/gump/core/update/svn.py (original)
+++ gump/trunk/python/gump/core/update/svn.py Fri Jun 24 07:32:03 2005
@@ -165,18 +165,7 @@
         # Update Context w/ Results  
         if not cmdResult.isOk():              
             log.error('Failed to checkout/update module: ' + module.name)   
-            if not exists:     
-                module.changeState(STATE_FAILED,REASON_UPDATE_FAILED)
-            else:
-                module.addError('*** Failed to update from source control. Stale contents
***')
-                        
-                # Black mark for this repository
-                repository=module.getRepository()
-                repository.addError('*** Failed to update %s from source control. Stale contents
***'	\
-                                    % module.getName())
-                                        
-                # Kinda bogus, but better than nowt (for now)
-                module.changeState(STATE_SUCCESS,REASON_UPDATE_FAILED)
+            module.changeState(STATE_FAILED,REASON_UPDATE_FAILED)
         else:
             module.changeState(STATE_SUCCESS)       
                          



Mime
View raw message