Bug#928920: marked as done (patch: Introduce logging functions that check ${VERBOSE})

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Bug#928920: marked as done (patch: Introduce logging functions that check ${VERBOSE})

Debian Bug Tracking System
Your message dated Tue, 13 Aug 2019 18:50:48 +0000
with message-id <[hidden email]>
and subject line Bug#928920: fixed in lsb 11.0.0
has caused the Debian Bug report #928920,
regarding patch: Introduce logging functions that check ${VERBOSE}
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [hidden email]
immediately.)


--
928920: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928920
Debian Bug Tracking System
Contact [hidden email] with problems


Package: lsb-base
Severity: wishlist
Tags: patch

From 58dd6e6add24a4e5531a84ff2404f2f5ed71e114 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <[hidden email]>
Date: Sat, 11 May 2019 21:20:48 +0000
Subject: [PATCH] Introduce logging functions that check ${VERBOSE}

Use of logging functions in initscripts are often conditioned on value
of $VERBOSE variable, causing same code to be repeated over and over
again.

This change introduce number of logging functions (with prefix "v") that
are functionally equivalent to their counterparts without prefix when
value of $VERBOSE is not "no", and do nothing if value of $VERBOSE is "no".
---
 conf/conf.yaml                    | 7 +++++++
 debian/control                    | 1 +
 debian/lsb-base.install           | 1 +
 debian/rules                      | 4 ++++
 init-functions.d/.gitignore       | 1 +
 init-functions.d/00-verbose.jinja | 9 +++++++++
 6 files changed, 23 insertions(+)
 create mode 100644 conf/conf.yaml
 create mode 100644 init-functions.d/.gitignore
 create mode 100644 init-functions.d/00-verbose.jinja

diff --git a/conf/conf.yaml b/conf/conf.yaml
new file mode 100644
index 0000000..d1ac18b
--- /dev/null
+++ b/conf/conf.yaml
@@ -0,0 +1,7 @@
+log_functions:
+  - log_daemon_msg
+  - log_begin_msg
+  - log_end_msg
+  - log_action_msg
+  - log_action_begin_msg
+  - log_action_end_msg
diff --git a/debian/control b/debian/control
index b39cdc6..e4746d2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>> 11~),
  python3-all:any,
  dh-python,
  distro-info-data,
+ ionit
 Standards-Version: 4.2.1
 Homepage: https://wiki.linuxfoundation.org/lsb/start
 Vcs-Browser: https://salsa.debian.org/debian/lsb
diff --git a/debian/lsb-base.install b/debian/lsb-base.install
index 66dc0df..d2d9588 100644
--- a/debian/lsb-base.install
+++ b/debian/lsb-base.install
@@ -1,2 +1,3 @@
 init-functions /lib/lsb
+init-functions.d/00-verbose          /lib/lsb/init-functions.d
 init-functions.d/20-left-info-blocks /lib/lsb/init-functions.d
diff --git a/debian/rules b/debian/rules
index 33c4aff..32789c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,10 @@ PY3VERSIONS=$(shell [ -x /usr/bin/py3versions ] && py3versions -vr)
 %:
  dh $@ --with python3
 
+override_dh_auto_build:
+ dh_auto_build
+ ionit -c conf -t init-functions.d
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
diff --git a/init-functions.d/.gitignore b/init-functions.d/.gitignore
new file mode 100644
index 0000000..876584d
--- /dev/null
+++ b/init-functions.d/.gitignore
@@ -0,0 +1 @@
+00-verbose
diff --git a/init-functions.d/00-verbose.jinja b/init-functions.d/00-verbose.jinja
new file mode 100644
index 0000000..15916aa
--- /dev/null
+++ b/init-functions.d/00-verbose.jinja
@@ -0,0 +1,9 @@
+## Generated automatically. Do not edit! -*- shell-script -*-
+{% for fn in log_functions %}
+v{{ fn }} () {
+ if test "${VERBOSE:-yes}" != no ; then
+ {{ fn }} "$@"
+ fi
+}
+{% endfor %}
+# vim: ft=sh
--
        Note, that I send and fetch email in batch, once every 24 hours.
                 If matter is urgent, try https://t.me/kaction
                                                                             --

Source: lsb
Source-Version: 11.0.0

We believe that the bug you reported is fixed in the latest version of
lsb, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [hidden email],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Dmitry Bogatov <[hidden email]> (supplier of updated lsb package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [hidden email])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Tue, 13 Aug 2019 18:24:19 +0000
Source: lsb
Architecture: source
Version: 11.0.0
Distribution: unstable
Urgency: medium
Maintainer: Debian sysvinit maintainers <[hidden email]>
Changed-By: Dmitry Bogatov <[hidden email]>
Closes: 924519 928920
Changes:
 lsb (11.0.0) unstable; urgency=medium
 .
   * New maintainer (Closes: #924519)
   * Introduce logging functions that check ${VERBOSE} (Closes: #928920)
   * Trim trailing whitespace.
   * Bump debhelper from old 11 to 12.
   * Change priority extra to priority optional.
   * Update standards version to 4.4.0
   * Reformat debian/changelog to fit 80 column
   * Remove unused `debian/gbp.conf'
   * Remove redundant priority field in bin:lsb-release
   * Remove suggestion for non-existent bin:lsb
Checksums-Sha1:
 b42f809c5c537f2973c882b5bc0f25aadc41ba26 1800 lsb_11.0.0.dsc
 98ad2032636fb0cf612bbf5f3cc24b756221c5af 42576 lsb_11.0.0.tar.xz
 b2288b2eba2f8ce24ba993d003b28867b7d578dd 6331 lsb_11.0.0_source.buildinfo
Checksums-Sha256:
 ffb66ee8303be1b92c094ce95c2d878cbcd10e2784006aa2e23440e2b0e3bd39 1800 lsb_11.0.0.dsc
 14c899dcc9021e25149a439c1d5ceb34d2e115f626419ed958ba8857d0ea4210 42576 lsb_11.0.0.tar.xz
 13b5831aa964042b449bfafd74f4ef271e9f8fa76ff0bc51731e668222b00b2a 6331 lsb_11.0.0_source.buildinfo
Files:
 1da76109cdb3eaed55c601e3b06d2838 1800 misc optional lsb_11.0.0.dsc
 4fd327d9b0a2d971d364964cd5b25288 42576 misc optional lsb_11.0.0.tar.xz
 5114f7de5d6a225396b1f40fad582521 6331 misc optional lsb_11.0.0_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJHBAEBCgAxFiEEhnHVzDbtdH7ktKj4SBLY3qgmEeYFAl1TALoTHGthY3Rpb25A
a2VlbWFpbC5tZQAKCRBIEtjeqCYR5iMXD/4uD01KH88B29lpjouoTD4AhwvhfsmF
G7Djj6YCVHSFJXBycKZ0m2vrzZ92RKZjEdoPMj7wzSDiqIrQBrxCPQLw1wNSvbNd
KV6PbUz4UWC5ZCZpQ9OI2JQ3AXoBigxuONv/EDVcTa8+hhjZWh+CzasRhy0Ao5b6
xET1ktMflQsm/eAbcIt6azUsMY5nd7dVLZUB7ihbgLKgvEo5NPOeDzrPaJj6Zlrb
ceBa8blkrKBwWYTP4MILoLbShk0ljr0OlX0rT+8WLDBIdg7TOluxTH1OsWOYW9Jy
+eafqSaU0sGU+0ndg6nxzjsMrC2RHskP9Kdfio4aIwU20j2stqoPCTczEyUQTHql
p3TN4PXTGI6IUGB246KqTiMWrJRlWWfrsYc2aR6Z/SgXoQ2b3NI6hQsU8FC3NPmE
2zQJ6ULw2iMZ9Ps5zuHY0iMotRmKE92erMnSdGfAJHdB60VXXqy5deBFdp1Hmx4t
4in9e8SpGHs2w4S4MZgMqyZhrvThxmZiakZTOke7/sSZKVWPs7J8wmLEYhewJbXM
0gBKd7zMEd81/DklI8tR3YfeJhxWFNjDUoLEz8QIYiQnSc1vFNp5/QHCqL3CXfOF
bZAydJRyksI0siNlZ6x7gLQsef0aR0Lx8TKMr3fn9fS/EHSrdnWIJmjhTBs4CRVw
65pUskhhDbiiHw==
=55wh
-----END PGP SIGNATURE-----

attachment0 (849 bytes) Download Attachment