Return-Path: Delivered-To: apmail-gump-commits-archive@www.apache.org Received: (qmail 78105 invoked from network); 24 Jun 2005 14:32:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Jun 2005 14:32:08 -0000 Received: (qmail 40471 invoked by uid 500); 24 Jun 2005 14:32:08 -0000 Mailing-List: contact commits-help@gump.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: general@gump.apache.org Delivered-To: mailing list commits@gump.apache.org Received: (qmail 40458 invoked by uid 99); 24 Jun 2005 14:32:08 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jun 2005 07:32:08 -0700 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 24 Jun 2005 07:32:08 -0700 Received: (qmail 78053 invoked by uid 65534); 24 Jun 2005 14:32:05 -0000 Message-ID: <20050624143205.78052.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@gump.apache.org From: ajack@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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)