From nobody Tue Jan 21 04:13:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1736418751158179.35426687345796; Thu, 9 Jan 2025 02:32:31 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 485E4153B; Thu, 9 Jan 2025 05:32:29 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 103ED1538; Thu, 9 Jan 2025 05:32:12 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4DAE114FA; Thu, 9 Jan 2025 05:32:09 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2ECCF1521 for ; Thu, 9 Jan 2025 05:32:08 -0500 (EST) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-655-Q5CJV24jOBeigfH_eLxJjw-1; Thu, 09 Jan 2025 05:32:06 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 41CA619560A3 for ; Thu, 9 Jan 2025 10:32:05 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.97]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 58A7E1955BE3; Thu, 9 Jan 2025 10:32:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736418727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8q6Y5XRqTmDyxAwGOzulMpUVbaencDVJ4RZ2ZCxmZAs=; b=D1YjGWh8636p8fAatuxnsHMIIUeBBT0rMFADxFdoNb2bLE1ZoOOcS20UepcCNSjfW4On/I iJzFjdeIrYkr86nrHORDmF+GERhCs+cAl1BooE+sPRiVHPE7WTxDVjokmtEchjuFBgnQYv vG4nMMAz2oMdD9KxALk/GO0bPnJ/2J0= X-MC-Unique: Q5CJV24jOBeigfH_eLxJjw-1 X-Mimecast-MFC-AGG-ID: Q5CJV24jOBeigfH_eLxJjw From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH] access: fix po_check when polkit is disabled Date: Thu, 9 Jan 2025 10:32:03 +0000 Message-ID: <20250109103203.1248979-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ilw3t8f_l9kaauTGLUjnoBO9-ll5W3h7DAvAkd80caY_1736418725 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZYEUBXENIFELKN4RBV2STPIBDI24SYC7 X-Message-ID-Hash: ZYEUBXENIFELKN4RBV2STPIBDI24SYC7 X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1736418752878116600 Content-Type: text/plain; charset="utf-8" The generated org.libvirt.api.policy.in file was recently added to the POTFILES list as it contains translatable messages. It is only generated when WITH_POLKIT && WITH_LIBVIRTD is satisfied though, resulting in the 'po_check' syntax rule failing if either of those conditions are not met. It is harmless to unconditionally generate this file, as a separate rule takes care of of installing it, and the latter remains under the build conditions. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- src/access/meson.build | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/access/meson.build b/src/access/meson.build index 0cc9cf2b79..d1336c0093 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -63,19 +63,22 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ) endforeach =20 +# Generated outside the WITH_POLKIT / WITH_LIBVIRTD condition +# because syntax-check/po_check requires this to exist +polgen =3D custom_target( + 'org.libvirt.api.policy.in', + input: access_perm_h, + output: 'org.libvirt.api.policy.in', + command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@' ], + capture: true, + build_by_default: true, +) +access_generated +=3D polgen + if conf.has('WITH_POLKIT') access_sources +=3D access_polkit_sources =20 if conf.has('WITH_LIBVIRTD') - polgen =3D custom_target( - 'org.libvirt.api.policy.in', - input: access_perm_h, - output: 'org.libvirt.api.policy.in', - command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@= ' ], - capture: true, - build_by_default: true, - ) - access_generated +=3D polgen =20 i18n.merge_file( input: polgen, --=20 2.47.1