From 935931b812a48173d79b03945d6344c3282bd9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 8 Mar 2016 09:24:18 +0100 Subject: [PATCH] [gather] Fix documentation of multilib white- and blacklist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For blacklist the matching is done using shell-style globs. For whitelists there is no matching at all and package names must be configured exactly. Signed-off-by: Lubomír Sedlář --- doc/configuration.rst | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/configuration.rst b/doc/configuration.rst index 00e92473..60a25cc6 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -469,10 +469,12 @@ Options * ``yaboot`` **additional_packages** - (*list*) -- additional packages to be included in a variant and architecture; format: [(variant_uid_regex, {arch|*: [package_globs]})] + (*list*) -- additional packages to be included in a variant and + architecture; format: ``[(variant_uid_regex, {arch|*: [package_globs]})]`` **filter_packages** - (*list*) -- packages to be excluded from a variant and architecture; format: [(variant_uid_regex, {arch|*: [package_globs]})] + (*list*) -- packages to be excluded from a variant and architecture; + format: ``[(variant_uid_regex, {arch|*: [package_globs]})]`` **filter_system_release_packages** (*bool*) -- for each variant, figure out the best system release package @@ -480,16 +482,22 @@ Options one system release package. In such case, set this option to ``False``. **multilib_blacklist** - (*dict*) -- multilib blacklist; format: {arch|*: [package_globs]} + (*dict*) -- multilib blacklist; format: ``{arch|*: [package_globs]}``. The + patterns are tested with ``fnmatch``, so shell globbing is used (not + regular expression). **multilib_whitelist** - (*dict*) -- multilib blacklist; format: {arch|*: [package_globs]} + (*dict*) -- multilib blacklist; format: ``{arch|*: [package_names]}``. The + whitelist must contain exact package names; there are no wildcards or + pattern matching. **gather_lookaside_repos** = [] - (*list*) -- lookaside repositories used for package gathering; format: [(variant_uid_regex, {arch|*: [repo_urls]})] + (*list*) -- lookaside repositories used for package gathering; format: + ``[(variant_uid_regex, {arch|*: [repo_urls]})]`` **hashed_directories** = False - (*bool*) -- put packages into "hashed" directories, for example Packages/k/kernel-4.0.4-301.fc22.x86_64.rpm + (*bool*) -- put packages into "hashed" directories, for example + ``Packages/k/kernel-4.0.4-301.fc22.x86_64.rpm`` Example