From nobody Sat Apr 27 13:40:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635946353; cv=none; d=zohomail.com; s=zohoarc; b=TYm1qlMG4vmyzF1hEiWLpyMjjch9I+abN4a1z0/kkG7U3kre1kb6Yve20tSZgxsul+FEuVgb/hr/deX3cDqLOjj8KeXXtXpMTIET/0IGMhOuhf8kpmhgc8D1sbr9Oy1UZ1+sgoNK6bz766P6zmLeqh9rRXnKD/YFerfon2x8EVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635946353; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ApQATpS9KTTBZDdmFif0ExiwOv3VkVaOkTi4ElsFVf4=; b=WAor5y1iWI/KHs0awyDEnQ5Myl8nJ1xx5t/hcvDtjrqGljTmgh90iMp/1iy7EYAHwEFC5Y+3HowdLQ5w90rwsO4h/kF2aeOZCZNTpHhpA8+BCFvlEn+4xnNw2iBoigDjbhMeFg5XxU242Mq34H8OcrQ6jW0BPim/W7FYJXTcMCA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1635946353143566.0597715366206; Wed, 3 Nov 2021 06:32:33 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-331-Kwi3C5RrO2yr0a6HGkaylA-1; Wed, 03 Nov 2021 09:32:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18C12100C660; Wed, 3 Nov 2021 13:32:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F25AA60843; Wed, 3 Nov 2021 13:32:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C621E1806D04; Wed, 3 Nov 2021 13:32:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A3DWJXG027097 for ; Wed, 3 Nov 2021 09:32:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 12D74196E6; Wed, 3 Nov 2021 13:32:19 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2299C196E5 for ; Wed, 3 Nov 2021 13:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635946352; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ApQATpS9KTTBZDdmFif0ExiwOv3VkVaOkTi4ElsFVf4=; b=NcntgKdTAqfoa1ZtzWka5+Vkpp/9NDHGll1LPCfurmwjDY3rMMj5VQqLi1QVGDgJg4Xj44 EugYteZu7fFyElKLY0XAUT/qE+sm1so38AVR4yhzQXSYXhmFCggOYQSXMf2Af6Ckn9zNwt OMdl1lLaUfc05YPyBdA6EL5BwFgctls= X-MC-Unique: Kwi3C5RrO2yr0a6HGkaylA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [PATCH] meson: Fix rst2html5 detection Date: Wed, 3 Nov 2021 14:32:11 +0100 Message-Id: <20211103133211.131507-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635946354781100001 Content-Type: text/plain; charset="utf-8" The first part of the version string contains the name that the rst2html5 command was invoked as, which can differ based on the operating system: on FreeBSD, for example, it's rst2html5.py instead of just rst2html5. Fix our detection logic so that it works regardless of the specific name used for the docutils-provided rst2html5 command. Fixes: cf0c9e186565e886a0016b2b269088b3eed3d26d Signed-off-by: Andrea Bolognani --- Pushed as a CI fix. meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 3a9066b9fe..6f5d480c1e 100644 --- a/meson.build +++ b/meson.build @@ -836,8 +836,8 @@ endforeach # Use this knowledge to detect the version that we know doesn't work # for building libvirt and reject it rst2html5_version =3D run_command(rst2html5_prog, '--version') -rst2html5_version =3D rst2html5_version.stdout().split('(') -if rst2html5_version[0] !=3D 'rst2html5 ' +rst2html5_version =3D rst2html5_version.stdout().split(' ') +if rst2html5_version[1] !=3D '(Docutils' error('Please uninstall the rst2html5 package and install the docutils p= ackage') endif =20 --=20 2.31.1