| Message ID | 20200929143654.518157-1-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] build-sys: fix git version from -version | expand |
On Tue, Sep 29, 2020 at 10:38 PM <marcandre.lureau@redhat.com> wrote: > > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Typo introduced with the script. > > Fixes: 2c273f32d3 ("meson: generate qemu-version.h") > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > scripts/qemu-version.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh > index 03128c56a2..3f6e7e6d41 100755 > --- a/scripts/qemu-version.sh > +++ b/scripts/qemu-version.sh > @@ -9,7 +9,7 @@ version="$3" > if [ -z "$pkgversion" ]; then > cd "$dir" > if [ -e .git ]; then > - pkgversion=$(git describe --match 'v*' --dirty | echo "") > + pkgversion=$(git describe --match 'v*' --dirty) || : > fi > fi > > -- > 2.26.2 > > Maybe this script can convert to python? as we are converting to meson+python, for less care about different bash/zsh/xsh differences? -- 此致 礼 罗勇刚 Yours sincerely, Yonggang Luo <div dir="ltr"><br><br>On Tue, Sep 29, 2020 at 10:38 PM <<a href="mailto:marcandre.lureau@redhat.com">marcandre.lureau@redhat.com</a>> wrote:<br>><br>> From: Marc-André Lureau <<a href="mailto:marcandre.lureau@redhat.com">marcandre.lureau@redhat.com</a>><br>><br>> Typo introduced with the script.<br>><br>> Fixes: 2c273f32d3 ("meson: generate qemu-version.h")<br>> Signed-off-by: Marc-André Lureau <<a href="mailto:marcandre.lureau@redhat.com">marcandre.lureau@redhat.com</a>><br>> ---<br>> scripts/qemu-version.sh | 2 +-<br>> 1 file changed, 1 insertion(+), 1 deletion(-)<br>><br>> diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh<br>> index 03128c56a2..3f6e7e6d41 100755<br>> --- a/scripts/qemu-version.sh<br>> +++ b/scripts/qemu-version.sh<br>> @@ -9,7 +9,7 @@ version="$3"<br>> if [ -z "$pkgversion" ]; then<br>> cd "$dir"<br>> if [ -e .git ]; then<br>> - pkgversion=$(git describe --match 'v*' --dirty | echo "")<br>> + pkgversion=$(git describe --match 'v*' --dirty) || :<br>> fi<br>> fi<br>><br>> --<br>> 2.26.2<br>><br>><br>Maybe this script can convert to python? as we are converting to meson+python,<div>for less care about different bash/zsh/xsh differences?<br><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo</div></div>
On 9/29/20 9:36 AM, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Typo introduced with the script. > > Fixes: 2c273f32d3 ("meson: generate qemu-version.h") > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > scripts/qemu-version.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Eric Blake <eblake@redhat.com> > diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh > index 03128c56a2..3f6e7e6d41 100755 > --- a/scripts/qemu-version.sh > +++ b/scripts/qemu-version.sh > @@ -9,7 +9,7 @@ version="$3" > if [ -z "$pkgversion" ]; then > cd "$dir" > if [ -e .git ]; then > - pkgversion=$(git describe --match 'v*' --dirty | echo "") > + pkgversion=$(git describe --match 'v*' --dirty) || : > fi > fi > > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
On Tue, Sep 29, 2020 at 6:43 PM 罗勇刚(Yonggang Luo) <luoyonggang@gmail.com> wrote: > > > On Tue, Sep 29, 2020 at 10:38 PM <marcandre.lureau@redhat.com> wrote: > > > > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > > > Typo introduced with the script. > > > > Fixes: 2c273f32d3 ("meson: generate qemu-version.h") > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > --- > > scripts/qemu-version.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh > > index 03128c56a2..3f6e7e6d41 100755 > > --- a/scripts/qemu-version.sh > > +++ b/scripts/qemu-version.sh > > @@ -9,7 +9,7 @@ version="$3" > > if [ -z "$pkgversion" ]; then > > cd "$dir" > > if [ -e .git ]; then > > - pkgversion=$(git describe --match 'v*' --dirty | echo "") > > + pkgversion=$(git describe --match 'v*' --dirty) || : > > fi > > fi > > > > -- > > 2.26.2 > > > > > Maybe this script can convert to python? as we are converting to > meson+python, > for less care about different bash/zsh/xsh differences? > You are welcome to do it :) thanks > -- > 此致 > 礼 > 罗勇刚 > Yours > sincerely, > Yonggang Luo > -- Marc-André Lureau <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Sep 29, 2020 at 6:43 PM 罗勇刚(Yonggang Luo) <<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><br><br>On Tue, Sep 29, 2020 at 10:38 PM <<a href="mailto:marcandre.lureau@redhat.com" target="_blank">marcandre.lureau@redhat.com</a>> wrote:<br>><br>> From: Marc-André Lureau <<a href="mailto:marcandre.lureau@redhat.com" target="_blank">marcandre.lureau@redhat.com</a>><br>><br>> Typo introduced with the script.<br>><br>> Fixes: 2c273f32d3 ("meson: generate qemu-version.h")<br>> Signed-off-by: Marc-André Lureau <<a href="mailto:marcandre.lureau@redhat.com" target="_blank">marcandre.lureau@redhat.com</a>><br>> ---<br>> scripts/qemu-version.sh | 2 +-<br>> 1 file changed, 1 insertion(+), 1 deletion(-)<br>><br>> diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh<br>> index 03128c56a2..3f6e7e6d41 100755<br>> --- a/scripts/qemu-version.sh<br>> +++ b/scripts/qemu-version.sh<br>> @@ -9,7 +9,7 @@ version="$3"<br>> if [ -z "$pkgversion" ]; then<br>> cd "$dir"<br>> if [ -e .git ]; then<br>> - pkgversion=$(git describe --match 'v*' --dirty | echo "")<br>> + pkgversion=$(git describe --match 'v*' --dirty) || :<br>> fi<br>> fi<br>><br>> --<br>> 2.26.2<br>><br>><br>Maybe this script can convert to python? as we are converting to meson+python,<div>for less care about different bash/zsh/xsh differences?<br></div></div></blockquote><div><br></div><div>You are welcome to do it :)</div><div>thanks<br></div><div> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo</div></div> </blockquote></div><br clear="all"><br>-- <br><div dir="ltr" class="gmail_signature">Marc-André Lureau<br></div></div>
On Tue, Sep 29, 2020 at 11:33 PM Marc-André Lureau < marcandre.lureau@gmail.com> wrote: > > > > On Tue, Sep 29, 2020 at 6:43 PM 罗勇刚(Yonggang Luo) <luoyonggang@gmail.com> wrote: >> >> >> >> On Tue, Sep 29, 2020 at 10:38 PM <marcandre.lureau@redhat.com> wrote: >> > >> > From: Marc-André Lureau <marcandre.lureau@redhat.com> >> > >> > Typo introduced with the script. >> > >> > Fixes: 2c273f32d3 ("meson: generate qemu-version.h") >> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> > --- >> > scripts/qemu-version.sh | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh >> > index 03128c56a2..3f6e7e6d41 100755 >> > --- a/scripts/qemu-version.sh >> > +++ b/scripts/qemu-version.sh >> > @@ -9,7 +9,7 @@ version="$3" >> > if [ -z "$pkgversion" ]; then >> > cd "$dir" >> > if [ -e .git ]; then >> > - pkgversion=$(git describe --match 'v*' --dirty | echo "") >> > + pkgversion=$(git describe --match 'v*' --dirty) || : >> > fi >> > fi >> > >> > -- >> > 2.26.2 >> > >> > >> Maybe this script can convert to python? as we are converting to meson+python, >> for less care about different bash/zsh/xsh differences? > > > You are welcome to do it :) > thanks No problem. I've done one before. > >> >> -- >> 此致 >> 礼 >> 罗勇刚 >> Yours >> sincerely, >> Yonggang Luo > > > > -- > Marc-André Lureau -- 此致 礼 罗勇刚 Yours sincerely, Yonggang Luo <div dir="ltr"><br><br>On Tue, Sep 29, 2020 at 11:33 PM Marc-André Lureau <<a href="mailto:marcandre.lureau@gmail.com">marcandre.lureau@gmail.com</a>> wrote:<br>><br>><br>><br>> On Tue, Sep 29, 2020 at 6:43 PM 罗勇刚(Yonggang Luo) <<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>> wrote:<br>>><br>>><br>>><br>>> On Tue, Sep 29, 2020 at 10:38 PM <<a href="mailto:marcandre.lureau@redhat.com">marcandre.lureau@redhat.com</a>> wrote:<br>>> ><br>>> > From: Marc-André Lureau <<a href="mailto:marcandre.lureau@redhat.com">marcandre.lureau@redhat.com</a>><br>>> ><br>>> > Typo introduced with the script.<br>>> ><br>>> > Fixes: 2c273f32d3 ("meson: generate qemu-version.h")<br>>> > Signed-off-by: Marc-André Lureau <<a href="mailto:marcandre.lureau@redhat.com">marcandre.lureau@redhat.com</a>><br>>> > ---<br>>> > scripts/qemu-version.sh | 2 +-<br>>> > 1 file changed, 1 insertion(+), 1 deletion(-)<br>>> ><br>>> > diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh<br>>> > index 03128c56a2..3f6e7e6d41 100755<br>>> > --- a/scripts/qemu-version.sh<br>>> > +++ b/scripts/qemu-version.sh<br>>> > @@ -9,7 +9,7 @@ version="$3"<br>>> > if [ -z "$pkgversion" ]; then<br>>> > cd "$dir"<br>>> > if [ -e .git ]; then<br>>> > - pkgversion=$(git describe --match 'v*' --dirty | echo "")<br>>> > + pkgversion=$(git describe --match 'v*' --dirty) || :<br>>> > fi<br>>> > fi<br>>> ><br>>> > --<br>>> > 2.26.2<br>>> ><br>>> ><br>>> Maybe this script can convert to python? as we are converting to meson+python,<br>>> for less care about different bash/zsh/xsh differences?<br>><br>><br>> You are welcome to do it :)<br>> thanks<div>No problem. I've done one before.<br>><br>>><br>>> --<br>>> 此致<br>>> 礼<br>>> 罗勇刚<br>>> Yours<br>>> sincerely,<br>>> Yonggang Luo<br>><br>><br>><br>> --<br>> Marc-André Lureau<br><br><br><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo</div></div>
On 09/29/20 16:36, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Typo introduced with the script. > > Fixes: 2c273f32d3 ("meson: generate qemu-version.h") > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > scripts/qemu-version.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh > index 03128c56a2..3f6e7e6d41 100755 > --- a/scripts/qemu-version.sh > +++ b/scripts/qemu-version.sh > @@ -9,7 +9,7 @@ version="$3" > if [ -z "$pkgversion" ]; then > cd "$dir" > if [ -e .git ]; then > - pkgversion=$(git describe --match 'v*' --dirty | echo "") > + pkgversion=$(git describe --match 'v*' --dirty) || : > fi > fi > > Reported-by: Laszlo Ersek <lersek@redhat.com> Tested-by: Laszlo Ersek <lersek@redhat.com> Thanks! Laszlo
diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh index 03128c56a2..3f6e7e6d41 100755 --- a/scripts/qemu-version.sh +++ b/scripts/qemu-version.sh @@ -9,7 +9,7 @@ version="$3" if [ -z "$pkgversion" ]; then cd "$dir" if [ -e .git ]; then - pkgversion=$(git describe --match 'v*' --dirty | echo "") + pkgversion=$(git describe --match 'v*' --dirty) || : fi fi