Re: [Xen-devel] [PATCH 2/5] raisin: remove duplicate source config in raise

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Tue, 21 Apr 2015, George Dunlap wrote:
> On 04/21/2015 03:55 PM, Stefano Stabellini wrote:
> > Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> 
> I take it this got here by a bad merge or somethign?

yes, I think it happened like that...

> Acked-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
> 
> > ---
> >  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
> >  
> > 
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel