The branch, v4-20-test has been updated via 59365287486 docs-xml: Build and install man page for wspsearch via 9e946a8ddd3 python:gp: Fix logging with gp from 7908c00dec2 VERSION: Bump version up to Samba 4.20.0rc2...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-20-test - Log ----------------------------------------------------------------- commit 593652874866a22a9df7a93b09627c0fbc328129 Author: Anoop C S <anoo...@samba.org> Date: Tue Jan 30 14:33:07 2024 +0530 docs-xml: Build and install man page for wspsearch Commit 49b6137f7c2244aeb3cf9b65fc9d46fcf0b8dc55 switched the default to install `wspsearch` client from False to True but missed to build and install the corresponding man page. Therefore adding wspsearch.1 to the list of man pages to be built and installed by default. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15565 Signed-off-by: Anoop C S <anoo...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Anoop C S <anoo...@samba.org> Autobuild-Date(master): Tue Jan 30 14:38:58 UTC 2024 on atb-devel-224 (cherry picked from commit a48f8ae30775bb2dc07768c3df88968800f51470) Autobuild-User(v4-20-test): Jule Anger <jan...@samba.org> Autobuild-Date(v4-20-test): Mon Feb 5 14:05:01 UTC 2024 on atb-devel-224 commit 9e946a8ddd37ac8286c08293d1509260520f252e Author: Andreas Schneider <a...@samba.org> Date: Mon Jan 29 17:46:30 2024 +0100 python:gp: Fix logging with gp This allows enable INFO level logging with: `samba-gpupdate -d3` BUG: https://bugzilla.samba.org/show_bug.cgi?id=15558 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Joseph Sutton <josephsut...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> (cherry picked from commit 145194071b10c4c1857f28fe79c57fd63ffab889) ----------------------------------------------------------------------- Summary of changes: docs-xml/wscript_build | 1 + python/samba/gp/util/logging.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build index 95ed08ed1d8..434afacaf1e 100644 --- a/docs-xml/wscript_build +++ b/docs-xml/wscript_build @@ -54,6 +54,7 @@ manpages=''' manpages/wbinfo.1 manpages/winbindd.8 manpages/samba-log-parser.1 + manpages/wspsearch.1 ''' pam_winbind_manpages = ''' diff --git a/python/samba/gp/util/logging.py b/python/samba/gp/util/logging.py index 9e70891b62c..da085d8d7e6 100644 --- a/python/samba/gp/util/logging.py +++ b/python/samba/gp/util/logging.py @@ -23,9 +23,10 @@ import gettext import random import sys -logger = logging.getLogger() +logger = logging.getLogger("gp") + + def logger_init(name, log_level): - logger = logging.getLogger(name) logger.addHandler(logging.StreamHandler(sys.stdout)) logger.setLevel(logging.CRITICAL) if log_level == 1: -- Samba Shared Repository