From 19a42792dba4141ad1a2e4c16ae54ee8c2fb8d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 28 Aug 2018 13:49:14 +0200 Subject: [PATCH] docs: Add better description for package globs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is used in multiple places, but not defined anywhere. Fixes: https://pagure.io/pungi/issue/1028 Signed-off-by: Lubomír Sedlář --- doc/configuration.rst | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/doc/configuration.rst b/doc/configuration.rst index a83ae71d..85a0112f 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -668,19 +668,23 @@ Options * ``yaboot`` -- only ``yaboot`` package on ``ppc`` arch matches this (only in ``yum`` backend) +.. _additional_packages: + **additional_packages** (*list*) -- additional packages to be included in a variant and architecture; format: ``[(variant_uid_regex, {arch|*: [package_globs]})]`` The packages specified here are matched against RPM names, not any other - provides in the package not the name of source package. + provides in the package not the name of source package. Shell globbing is + used, so wildcards are possible. The package can be specified as name only + or ``name.arch``. **filter_packages** (*list*) -- packages to be excluded from a variant and architecture; format: ``[(variant_uid_regex, {arch|*: [package_globs]})]`` - The packages specified here are matched against RPM names, not any other - provides in the package not the name of source package. + See :ref:`additional_packages ` for details about + package specification. **filter_system_release_packages** (*bool*) -- for each variant, figure out the best system release package @@ -694,9 +698,10 @@ Options through this option can not be removed by ``filter_packages``. **multilib_blacklist** - (*dict*) -- multilib blacklist; format: ``{arch|*: [package_globs]}``. The - patterns are tested with ``fnmatch``, so shell globbing is used (not - regular expression). + (*dict*) -- multilib blacklist; format: ``{arch|*: [package_globs]}``. + + See :ref:`additional_packages ` for details about + package specification. **multilib_whitelist** (*dict*) -- multilib blacklist; format: ``{arch|*: [package_names]}``. The