[Qa-jenkins-scm] [jenkins.debian.net] 01/01: Revert "remove temporary fix, now that the systems have been fixed"

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 3b603ba41d8daa6c164285312e789e81997fe14e
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Wed Jun 7 11:21:26 2017 +0200

    Revert "remove temporary fix, now that the systems have been fixed"
    
    This reverts commit 18d0dcd4953cdab320cdc6c80745d5c6b304a17b.
    Reintroduce the fix because the link from
    /usr/local/bin/dsa-check-packages -> /bin/true
    still exists. The link must be removed in order to fix it.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 update_jdn.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/update_jdn.sh b/update_jdn.sh
index 8c8d403..b4ae0e1 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -52,11 +52,22 @@ set_correct_date() {
 }
 
 disable_dsa_check_packages() {
+	# FIXME: remove the repair of /bin/true when all hosts has been
+	# updated
+	# ln -s /bin/true /usr/local/bin/dsa-check-packages was used which
+	# broke /bin/true by overwriting it with the perl script dsa-check-packages
+	if grep -q '/usr/bin/perl' /bin/true || grep -q '/bin/sh' /bin/true ; then
+		sudo apt-get install --reinstall coreutils
+	fi
+
+	if [ -L /usr/local/bin/dsa-check-packages ] ; then
+		rm /usr/local/bin/dsa-check-packages
+	fi
+
 	# disable check for outdated packages as in the future (like this)
 	# packages from security.d.o will appear outdated always…
 	echo -e "#!/bin/sh\n# disabled dsa-check by update_jdn.sh\nexit 0" | sudo tee /usr/local/bin/dsa-check-packages
 	sudo chmod a+rx /usr/local/bin/dsa-check-packages
-
 }
 
 echo "--------------------------------------------"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git