[Qa-jenkins-scm] [jenkins.debian.net] 01/01: rep-arch-setup: Don't depend on the current curl flag order for sed

Holger Levsen holger at layer-acht.org
Wed Nov 22 00:58:19 UTC 2017


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 3b5f8cec512f3fc04f8f309ff0b61ddf28646003
Author: Johannes Löthberg <johannes at kyriasis.com>
Date:   Wed Nov 22 01:55:48 2017 +0100

    rep-arch-setup: Don't depend on the current curl flag order for sed
    
    Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_setup_archlinux_schroot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index 04f206d..b461791 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -171,7 +171,7 @@ Include = /etc/pacman.d/mirrorlist
 __END__
 
 $ROOTCMD sed -i "s/^PKGEXT='.pkg.tar.gz'/PKGEXT='.pkg.tar.xz'/" /etc/makepkg.conf
-$ROOTCMD sed -i "s|/usr/bin/curl -f|/usr/bin/curl -kf|" /etc/makepkg.conf
+$ROOTCMD sed -i "s|/usr/bin/curl |/usr/bin/curl -k |" /etc/makepkg.conf
 
 if [ "$HOSTNAME" = "profitbricks-build4-amd64" ] ; then
 	# disable signature verification so packages won't fail to install when setting the time to +$x years

-- 
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