From 3b82594a32756a55b786828cc955258ff5c035f8 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Tue, 28 Mar 2017 16:06:55 +0200 Subject: [PATCH] change config separator to whitespace --- docs/source/plugins.rst | 4 ++-- plugins/builder/save_failed_tree.conf | 2 +- plugins/builder/save_failed_tree.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/plugins.rst b/docs/source/plugins.rst index d3c29f07..e6e775dd 100644 --- a/docs/source/plugins.rst +++ b/docs/source/plugins.rst @@ -21,12 +21,12 @@ Additional feature is that some paths from buildroot can be left out from tarball. Feature can be configured via `/etc/kojid/plugins/save_failed_tree.conf` file. Currently only field filters.paths is used and it consists of globs (standard python's fnmatch is -used) separated by ':'. +used) separated by whitespaces. .. code-block:: ini [filters] - paths = /etc/*.keytab:/tmp/secret_data + paths = /etc/*.keytab /tmp/secret_data .. warning:: For security reasons, currently all ``/tmp/krb5cc*`` and ``/etc/*.keytab`` diff --git a/plugins/builder/save_failed_tree.conf b/plugins/builder/save_failed_tree.conf index 84df846d..66274c5e 100644 --- a/plugins/builder/save_failed_tree.conf +++ b/plugins/builder/save_failed_tree.conf @@ -2,4 +2,4 @@ volume = DEFAULT [filters] -paths = */tmp/krb5cc:*/etc/*.keytab +paths = */tmp/krb5cc */etc/*.keytab diff --git a/plugins/builder/save_failed_tree.py b/plugins/builder/save_failed_tree.py index f5fec8a2..1a22db6d 100644 --- a/plugins/builder/save_failed_tree.py +++ b/plugins/builder/save_failed_tree.py @@ -27,7 +27,7 @@ def read_config(): 'volume': None, } if cp.has_option('filters', 'paths'): - config['path_filters'] = cp.get('filters', 'paths').split(':') + config['path_filters'] = cp.get('filters', 'paths').split() if cp.has_option('general', 'volume'): config['volume'] = cp.get('general', 'volume').strip()