External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-31 17:05:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

access: fix po_check when polkit is disabled

Browse Source 
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.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2025-01-09 10:30:07 +00:00
parent 7a903458f1
commit 9ab2cd48ea
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/access/meson.build
View File

@ -63,19 +63,22 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
) )
endforeach endforeach
# Generated outside the WITH_POLKIT / WITH_LIBVIRTD condition
# because syntax-check/po_check requires this to exist
polgen = 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 += polgen
if conf.has('WITH_POLKIT') if conf.has('WITH_POLKIT')
access_sources += access_polkit_sources access_sources += access_polkit_sources
if conf.has('WITH_LIBVIRTD') if conf.has('WITH_LIBVIRTD')
polgen = 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 += polgen
i18n.merge_file( i18n.merge_file(
input: polgen, input: polgen,