diff mbox series

[PULL,19/38] build-sys: fix git version from -version

Message ID	20201012203343.1105018-20-pbonzini@redhat.com
State	Superseded
Headers	show Return-Path: <SRS0=wjGh=DT=nongnu.org=qemu-devel-bounces+qemu-devel=archiver.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71B46208D5 From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Subject: [PULL 19/38] build-sys: fix git version from -version Date: Mon, 12 Oct 2020 16:33:24 -0400 Message-Id: <20201012203343.1105018-20-pbonzini@redhat.com> In-Reply-To: <20201012203343.1105018-1-pbonzini@redhat.com> References: <20201012203343.1105018-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com Precedence: list Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>, Laszlo Ersek <lersek@redhat.com> Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org>
Series	SCSI, qdev, qtest, meson patches for 2020-10-10 \| expand [PULL,v2,00/38] SCSI, qdev, qtest, meson patches for 2020-10-10 [PULL,01/38] meson.build: Add comments to clarify code organization [PULL,02/38] meson.build: Sort sourcesets alphabetically [PULL,03/38] hw/core: Move the creation of the library to the main meson.build [PULL,04/38] chardev: Move the creation of the library to the main meson.build [PULL,05/38] migration: Move the creation of the library to the main meson.build [PULL,06/38] io: Move the creation of the library to the main meson.build [PULL,07/38] crypto: Move the creation of the library to the main meson.build [PULL,08/38] authz: Move the creation of the library to the main meson.build [PULL,09/38] qom: Move the creation of the library to the main meson.build [PULL,10/38] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE [PULL,11/38] softmmu: move more files to softmmu/ [PULL,12/38] exec: split out non-softmmu-specific parts [PULL,13/38] qom: fix objects with improper parent type [PULL,14/38] docs: Move QTest documentation to its own document [PULL,15/38] docs/devel/qtest: Include protocol spec in document [PULL,16/38] docs/devel/qtest: Include libqtest API reference [PULL,17/38] qtest: unify extra_qtest_srcs and extra_qtest_deps [PULL,18/38] docs/devel: update instruction on how to add new unit tests [PULL,19/38] build-sys: fix git version from -version [PULL,20/38] meson.build: Re-enable KVM support for MIPS [PULL,21/38] qtest: rename qtest_qmp_receive to qtest_qmp_receive_dict [PULL,22/38] qtest: Reintroduce qtest_qmp_receive with QMP event buffering [PULL,23/38] qtest: remove qtest_qmp_receive_success [PULL,24/38] device-plug-test: use qtest_qmp to send the device_del command [PULL,25/38] qtest: switch users back to qtest_qmp_receive [PULL,26/38] qtest: check that drives are really appearing and disappearing [PULL,27/38] qemu-iotests, qtest: rewrite test 067 as a qtest [PULL,28/38] qdev: add "check if address free" callback for buses [PULL,29/38] scsi/scsi_bus: switch search direction in scsi_device_find [PULL,30/38] device_core: use drain_call_rcu in in qmp_device_add [PULL,31/38] device-core: use RCU for list of children of a bus [PULL,32/38] scsi: switch to bus->check_address [PULL,33/38] device-core: use atomic_set on .realized property [PULL,34/38] scsi/scsi-bus: scsi_device_find: don't return unrealized devices [PULL,35/38] scsi/scsi_bus: Add scsi_device_get [PULL,36/38] virtio-scsi: use scsi_device_get [PULL,37/38] scsi/scsi_bus: fix races in REPORT LUNS [PULL,38/38] meson: identify more sections of meson.build

Commit Message

Paolo Bonzini Oct. 12, 2020, 8:33 p.m. UTC

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>
Reported-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200929143654.518157-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/qemu-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

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