From patchwork Thu Jan 30 13:18:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 23928 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C3FCC20341 for ; Thu, 30 Jan 2014 14:26:04 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id lf12sf7399332vcb.9 for ; Thu, 30 Jan 2014 06:26:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id:references :mime-version:in-reply-to:user-agent:cc:subject:precedence:reply-to :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-disposition; bh=L8/SnH0G+iXrj/80Rj9bwMZ/fRkL6PbTQUdldDjmNR4=; b=cBzBDa2epNBhUUmf6WB5ZFovexwtO9MuFxarX+7Fg/FXtdRtT18GDc96l0lxM+brXZ SaJV8Du3aFrBRfM6wvO092jj0pON5hcp2Lekgml6r+OTeRWjsfiXCYyvGwir2f4Py4lM tJzDWqu96OSUbXb54BfcwMFFbuMtRUavZlXWF8o6b1th3MtdBP0KbiOMIUj5QCvHrXXa ngPn2RQ7qV4lDa1g1iBEmZWfxsnPqCGSG+9ekPEJFb219Nbc1SxHpvXT/WmcvQJpy1AW DVrImEv+bXnvujtc0NByxyliIVQPgN+vUMMGRWDC9Zh120Q6fyHc+gQj/xJV+PzXLnUj Zb8w== X-Gm-Message-State: ALoCoQmuoIFrcjyXpRugX4Uh8i3o0B75/09tkxx/NfL6H79TFSYtRcPnjLuo7DdMKB7evGMKd/IC X-Received: by 10.58.85.3 with SMTP id d3mr4738775vez.40.1391091963962; Thu, 30 Jan 2014 06:26:03 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.137 with SMTP id x9ls621738qgx.53.gmail; Thu, 30 Jan 2014 06:26:03 -0800 (PST) X-Received: by 10.58.37.67 with SMTP id w3mr7550986vej.22.1391091963851; Thu, 30 Jan 2014 06:26:03 -0800 (PST) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id si7si2108387vdc.154.2014.01.30.06.26.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Jan 2014 06:26:03 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id cz12so2156445veb.26 for ; Thu, 30 Jan 2014 06:26:03 -0800 (PST) X-Received: by 10.58.133.15 with SMTP id oy15mr2498367veb.19.1391091963776; Thu, 30 Jan 2014 06:26:03 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp16595vcz; Thu, 30 Jan 2014 06:26:03 -0800 (PST) X-Received: by 10.50.62.102 with SMTP id x6mr33864193igr.35.1391091962369; Thu, 30 Jan 2014 06:26:02 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id v3si9020065ice.46.2014.01.30.06.26.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 30 Jan 2014 06:26:01 -0800 (PST) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1W8sYq-0006Qb-H9; Thu, 30 Jan 2014 14:25:44 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1W8sYo-0006QK-8w for edk2-devel@lists.sourceforge.net; Thu, 30 Jan 2014 14:25:42 +0000 Received: from mail-ea0-f177.google.com ([209.85.215.177]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1W8rVF-0003Ad-V5 for edk2-devel@lists.sourceforge.net; Thu, 30 Jan 2014 13:18:01 +0000 Received: by mail-ea0-f177.google.com with SMTP id n15so1622348ead.8 for ; Thu, 30 Jan 2014 05:17:49 -0800 (PST) X-Received: by 10.15.26.8 with SMTP id m8mr17378510eeu.25.1391087869184; Thu, 30 Jan 2014 05:17:49 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [46.235.226.95]) by mx.google.com with ESMTPSA id w4sm22493087eef.20.2014.01.30.05.17.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 30 Jan 2014 05:17:48 -0800 (PST) Date: Thu, 30 Jan 2014 13:18:48 +0000 From: Leif Lindholm To: Jordan Justen Message-ID: <20140130131848.GH11329@bivouac.eciton.net> References: <4A89E2EF3DFEDB4C8BFDE51014F606A1117BEF40@SHSMSX102.ccr.corp.intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A1117BF07A@SHSMSX102.ccr.corp.intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A1117BFC23@SHSMSX102.ccr.corp.intel.com> <20140129215958.8580.21659@jljusten-hsw> MIME-Version: 1.0 In-Reply-To: <20140129215958.8580.21659@jljusten-hsw> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Score: -0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1W8rVF-0003Ad-V5 Cc: "edk2-commits@lists.sourceforge.net" , edk2-devel@lists.sourceforge.net, "Parmeshwr_Prasad@Dell.com" Subject: Re: [edk2] edk2/edksetup.sh patch to solve command line parameter X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Disposition: inline On Wed, Jan 29, 2014 at 01:59:58PM -0800, Jordan Justen wrote: > Whoops. Looks like I also submitted a patch for the > missing s on BaseTools. > > On 2014-01-29 08:50:50, Leif Lindholm wrote: > > Actually, there is another issue with the new edksetup.sh - it returns success > > (0) regardless of whether the executions succeeds or not. > > > > The attached patch resolves both of these issues. > > Could you do add this information into the commit message? > > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Could you also add this to the commit message along with > a Signed-off-by? (See MdePkg/Contributions.txt) Of course. Updated version attached. / Leif ------------------------------------------------------------------------------ WatchGuard Dimension instantly turns raw network data into actionable security intelligence. It gives you real-time visual feedback on key security issues and trends. Skip the complicated setup - simply import a virtual appliance and go from zero to informed in seconds. http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk >From f15cbde4d459b2859eff3a8d2f62cd41727f886f Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Wed, 29 Jan 2014 16:46:31 +0000 Subject: [PATCH] fixes for new edksetup.sh This patch fixes a typo and a functional issue in edksetup.sh. The typo was a check for the string "BaseTool" instead of "BaseTools". The functional issue was that the script returned success even when configuration failed. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm --- edksetup.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/edksetup.sh b/edksetup.sh index 39b76e1..c1b57d7 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -30,6 +30,7 @@ function HelpMsg() echo Please note: This script must be \'sourced\' so the environment can be changed. echo ". edksetup.sh" echo "source edksetup.sh" + return 1 } function SetupEnv() @@ -51,7 +52,6 @@ if [ \ ] then HelpMsg - return else SetupEnv "$*" fi @@ -59,11 +59,14 @@ fi if [ $# -gt 1 ] then HelpMsg - return -elif [ $# -eq 1 ] && [ "$1" != "BaseTool" ] +elif [ $# -eq 1 ] && [ "$1" != "BaseTools" ] then HelpMsg - return fi +RETVAL=$? +if [ $RETVAL -ne 0 ] +then + return $RETVAL +fi SourceEnv "$*" -- 1.7.10.4