[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible-archlinux: make pacman fail less early

Mattia Rizzolo mattia at debian.org
Thu Nov 2 16:20:28 UTC 2017


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

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

commit 59f25e6ad14ff0984d7b036945fc5b3c76221abf
Author: kpcyrd <git at rxv.cc>
Date:   Thu Nov 2 17:18:38 2017 +0100

    reproducible-archlinux: make pacman fail less early
---
 bin/reproducible_setup_archlinux_schroot.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index 7b934a4..bdd31f2 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -93,13 +93,6 @@ chmod 755 $SCHROOT_BASE/$TARGET/etc/profile.d/proxy.sh
 echo ". /etc/profile.d/proxy.sh" | tee -a $SCHROOT_BASE/$TARGET/root/.bashrc
 
 # configure pacman
-if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] ; then
-	# YOLO! https://bugs.archlinux.org/task/45351 is where we got the workaround from…
-	# the real question however is: why on earth does this work on the jenkins node, but not on pb-build3
-	# pacman starts gpg, gpg starts gpg-agent and gpg-agent is killed when the shells ends.
-	# this works nicely on one host, but not on the other. let's see how this works without gpg-agent at all…
-	sed -i -s "s#no-permission-warning#no-permission-warning --no-autostart#g" $SCHROOT_BASE/$TARGET/usr/bin/pacman-key
-fi
 $ROOTCMD bash -l -c 'pacman-key --init'
 $ROOTCMD bash -l -c 'pacman-key --populate archlinux'
 # use a specific mirror

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



More information about the Qa-jenkins-scm mailing list