Return-Path: X-Original-To: apmail-gump-commits-archive@www.apache.org Delivered-To: apmail-gump-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 791899D7B for ; Mon, 26 Mar 2012 04:11:59 +0000 (UTC) Received: (qmail 57905 invoked by uid 500); 26 Mar 2012 04:11:58 -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 57836 invoked by uid 99); 26 Mar 2012 04:11:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Mar 2012 04:11:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Mar 2012 04:11:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E8375238897A; Mon, 26 Mar 2012 04:11:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1305214 - /gump/trunk/python/gump/core/update/hg.py Date: Mon, 26 Mar 2012 04:11:34 -0000 To: commits@gump.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120326041134.E8375238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Mon Mar 26 04:11:34 2012 New Revision: 1305214 URL: http://svn.apache.org/viewvc?rev=1305214&view=rev Log: true is not in /bin on FreeBSD but in /usr/bin. Take the opportunity to use a more useful dummy command. Modified: gump/trunk/python/gump/core/update/hg.py Modified: gump/trunk/python/gump/core/update/hg.py URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/update/hg.py?rev=1305214&r1=1305213&r2=1305214&view=diff ============================================================================== --- gump/trunk/python/gump/core/update/hg.py (original) +++ gump/trunk/python/gump/core/update/hg.py Mon Mar 26 04:11:34 2012 @@ -67,19 +67,21 @@ class HgUpdater(ScmUpdater): cmd.addParameter('incoming') setup_common_parameters(module, cmd) result = execute(cmd) + if not result.isOk(): module.addInfo('No updates') - return Cmd('/bin/true', 'update_' + module.getName(), - module.getSourceControlStagingDirectory()) - - cmd = Cmd('hg', 'update_' + module.getName(), - module.getSourceControlStagingDirectory()) - cmd.addParameter('pull') - # update working copy - cmd.addParameter('-u') - setup_common_parameters(module, cmd) - # pull everything, don't ask - cmd.addParameter('-y') + cmd = Cmd('echo', 'update_' + module.getName(), + module.getSourceControlStagingDirectory()) + cmd.addParameter('hg incoming indicated no changes to pull') + else: + cmd = Cmd('hg', 'update_' + module.getName(), + module.getSourceControlStagingDirectory()) + cmd.addParameter('pull') + # update working copy + cmd.addParameter('-u') + setup_common_parameters(module, cmd) + # pull everything, don't ask + cmd.addParameter('-y') return cmd def workspaceMatchesModule(self, module):