From mboxrd@z Thu Jan  1 00:00:00 1970
From: George Dunlap <george.dunlap@eu.citrix.com>
Subject: Re: [PATCH 2/5] raisin: remove duplicate source config
	in raise
Date: Tue, 21 Apr 2015 16:09:37 +0100
Message-ID: <55366831.9090406@eu.citrix.com>
References: <alpine.DEB.2.02.1504211551510.3112@kaball.uk.xensource.com>
	<1429628103-10979-2-git-send-email-stefano.stabellini@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1429628103-10979-2-git-send-email-stefano.stabellini@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>, xen-devel@lists.xensource.com
Cc: george.dunlap@citrix.com
List-Id: xen-devel@lists.xenproject.org

On 04/21/2015 03:55 PM, Stefano Stabellini wrote:
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

I take it this got here by a bad merge or somethign?

Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

> ---
>  raise |   15 +++++----------
>  1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/raise b/raise
> index bce6908..68dbfd8 100755
> --- a/raise
> +++ b/raise
> @@ -17,9 +17,12 @@ _help() {
>  }
>  
>  # Include your defaults
> -if [[ -e "./config" ]] ; then
> -    . ./config
> +if [[ ! -e "./config" ]]
> +then
> +   echo "No config file found, copying default config"
> +   cp defconfig config
>  fi
> +source ./config
>  
>  # To use this as a library, set RAISIN_PATH appropriately
>  [[ -z "$RAISIN_PATH" ]] && RAISIN_PATH="$PWD/lib"
> @@ -29,14 +32,6 @@ source ${RAISIN_PATH}/common-functions.sh
>  source ${RAISIN_PATH}/git-checkout.sh
>  source ${RAISIN_PATH}/commands.sh
>  
> -# Include your defaults
> -if [[ ! -e "./config" ]] ; then
> -   echo "No config file found, copying default config"
> -   cp defconfig config
> -fi
> -
> -source ./config
> -
>  # Set up basic functionality
>  common_init
>  
>