[libvirt] [rust PATCH] travis: fix syntax for script commands

Daniel P. Berrangé posted 1 patch 6 years ago
Failed in applying to current master (apply log)
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[libvirt] [rust PATCH] travis: fix syntax for script commands
Posted by Daniel P. Berrangé 6 years ago
The script: commands were listed without a leading '-' which caused
travis to concatenate them into a single command. This meant the second
command became a set of arguments to the first command. Historically
cargo ignored these extra args so the mistake was not noticed, but it
now generates a fatal error.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9844bb..c52f745 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,5 +40,5 @@ install:
   - echo "pass" | sudo saslpasswd2 -p -a libvirt user
 
 script:
-  cargo test --verbose
-  cargo test --verbose -- --ignored
+  - cargo test --verbose
+  - cargo test --verbose -- --ignored
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [rust PATCH] travis: fix syntax for script commands
Posted by Sahid Orentino Ferdjaoui 6 years ago
On Tue, Apr 24, 2018 at 01:33:20PM +0100, Daniel P. Berrangé wrote:
> The script: commands were listed without a leading '-' which caused
> travis to concatenate them into a single command. This meant the second
> command became a set of arguments to the first command. Historically
> cargo ignored these extra args so the mistake was not noticed, but it
> now generates a fatal error.
>

Thanks for this Daniel. Do you want me to merge it or are you going to
take care of that too?

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com>

> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  .travis.yml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index f9844bb..c52f745 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -40,5 +40,5 @@ install:
>    - echo "pass" | sudo saslpasswd2 -p -a libvirt user
>  
>  script:
> -  cargo test --verbose
> -  cargo test --verbose -- --ignored
> +  - cargo test --verbose
> +  - cargo test --verbose -- --ignored
> -- 
> 2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [rust PATCH] travis: fix syntax for script commands
Posted by Daniel P. Berrangé 6 years ago
On Tue, Apr 24, 2018 at 02:48:29PM +0200, Sahid Orentino Ferdjaoui wrote:
> On Tue, Apr 24, 2018 at 01:33:20PM +0100, Daniel P. Berrangé wrote:
> > The script: commands were listed without a leading '-' which caused
> > travis to concatenate them into a single command. This meant the second
> > command became a set of arguments to the first command. Historically
> > cargo ignored these extra args so the mistake was not noticed, but it
> > now generates a fatal error.
> >
> 
> Thanks for this Daniel. Do you want me to merge it or are you going to
> take care of that too?

I'll push it - was just posting for review

> 
> Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com>
> 
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > ---
> >  .travis.yml | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/.travis.yml b/.travis.yml
> > index f9844bb..c52f745 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -40,5 +40,5 @@ install:
> >    - echo "pass" | sudo saslpasswd2 -p -a libvirt user
> >  
> >  script:
> > -  cargo test --verbose
> > -  cargo test --verbose -- --ignored
> > +  - cargo test --verbose
> > +  - cargo test --verbose -- --ignored
> > -- 
> > 2.14.3

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list