You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by aj...@apache.org on 2005/06/24 16:32:04 UTC

svn commit: r201624 - in /gump/trunk/python/gump/core/update: cvs.py p4.py svn.py

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)       
                          



Re: svn commit: r201624 - in /gump/trunk/python/gump/core/update: cvs.py p4.py svn.py

Posted by "Adam R. B. Jack" <aj...@apache.org>.
> The commit itself made me itch to spend more time on Python, the exact
> same code-change in three different files.

Yeah, bad copy-n-paste on my part (ok, 1 of the 2 copies). The more I look
at Gump2 these days, the more I feel I need to spend time on Gump3 & see if
I can do Python right these days.

regards

Adam


---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org


Re: svn commit: r201624 - in /gump/trunk/python/gump/core/update: cvs.py p4.py svn.py

Posted by Stefan Bodewig <bo...@apache.org>.
On Fri, 24 Jun 2005, <aj...@apache.org> wrote:

> SCM update failure a module failure (even if we have a stale copy.)

Cool thanks.

The commit itself made me itch to spend more time on Python, the exact
same code-change in three different files.

Well, there are at least four proprietary MS technologies to tackle
before that, I'm afraid.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org