[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: remove ancient workaround

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
d0eba475 by Holger Levsen at 2018-04-21T16:45:11-03:00
reproducible Debian: remove ancient workaround

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
07cd371d by Holger Levsen at 2018-04-21T16:46:52-03:00
drop confusing comment

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- update_jdn.sh


Changes:

=====================================
update_jdn.sh
=====================================
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -54,19 +54,7 @@ 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
-		sudo rm /usr/local/bin/dsa-check-packages
-	fi
-
-	# disable check for outdated packages as in the future (like this)
+	# disable check for outdated packages as someday in the future
 	# 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
@@ -522,7 +510,7 @@ if [ -f /etc/debian_version ] ; then
 		elif [ "$HOSTNAME" = "profitbricks-build6-i386" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then
 			$UP2DATE || sudo apt-get install linux-image-amd64
 		fi
-		# only needed on the main nodes # FIXME this is redundant
+		# only needed on the main nodes
 		if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then
 			$UP2DATE || sudo apt-get install jenkins-job-builder/stretch-backports
 		elif [ "$HOSTNAME" = "jenkins" ] ; then



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/5947e9e0ce512a17d4a948bd4f69106ddb398ac4...07cd371dd018af6cda50cf61dffd62369a047c5a

---
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/5947e9e0ce512a17d4a948bd4f69106ddb398ac4...07cd371dd018af6cda50cf61dffd62369a047c5a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180421/9f5552b6/attachment-0001.html>