[debian-edu-commits] debian-edu/ 01/01: postinst: instead of testing with [ -x /usr/bin/etckeeper ] use "which etckeeper" and drop lintian.overrides for command-with-path-in-maintainer-script. Thanks lintian.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-config.

commit 64421444eb5d831c44a95eec8c2b7192063d81bc
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Feb 16 10:59:17 2018 +0000

    postinst: instead of testing with [ -x /usr/bin/etckeeper ] use "which etckeeper" and drop lintian.overrides for command-with-path-in-maintainer-script. Thanks lintian.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                           | 8 ++++++++
 debian/debian-edu-config.lintian-overrides | 2 --
 debian/debian-edu-config.postinst          | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 164a49b..f905aa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-config (2.10.24) UNRELEASED; urgency=medium
+
+  * postinst: instead of testing with [ -x /usr/bin/etckeeper ] use
+    "which etckeeper" and drop lintian.overrides for
+    command-with-path-in-maintainer-script. Thanks lintian.
+
+ -- Holger Levsen <holger at debian.org>  Fri, 16 Feb 2018 10:57:40 +0000
+
 debian-edu-config (2.10.23) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index 9dc4b81..7e2043e 100644
--- a/debian/debian-edu-config.lintian-overrides
+++ b/debian/debian-edu-config.lintian-overrides
@@ -2,8 +2,6 @@ debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/a
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/hostname
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/wpad-proxy-update
-debian-edu-config binary: command-with-path-in-maintainer-script postinst:51 /usr/bin/etckeeper
-debian-edu-config binary: command-with-path-in-maintainer-script postinst:290 /usr/bin/etckeeper
 debian-edu-config binary: non-standard-apache2-configuration-name debian-edu-config-doc.conf != debian-edu-config.conf
 debian-edu-config binary: debconf-is-not-a-registry usr/bin/ldap-debian-edu-install
 debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/d-i/finish-install
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 7030464..8bf73b7 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -48,7 +48,7 @@ fi
 
 # Execute early, to get the state before changes activated by this
 # package is done.
-if [ -x /usr/bin/etckeeper ] ; then
+if which etckeeper > /dev/null ; then
     etckeeper commit "start of debian-edu-config postinst" || true
 fi
 
@@ -227,7 +227,7 @@ if dpkg --compare-versions "$2" le "1.931~" && [ -f /usr/bin/gtick.ltsp ] ; then
 fi
 
 # Register all changes done by this postinst script
-if [ -x /usr/bin/etckeeper ] ; then
+if which etckeeper > /dev/null ; then
     etckeeper commit "end of debian-edu-config postinst" || true
 fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git