[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Archlinux: make sed calls more robust

[Holger Levsen]

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


Commits:
be8fc3f5 by Holger Levsen at 2018-11-14T15:10:56Z
reproducible Archlinux: make sed calls more robust

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

- - - - -


1 changed file:

- bin/reproducible_setup_archlinux_schroot.sh


Changes:

=====================================
bin/reproducible_setup_archlinux_schroot.sh
=====================================
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2015-2017 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2018 Holger Levsen <holger at layer-acht.org>
 #                2017 kpcyrd <git at rxv.cc>
 #                2017 Mattia Rizzolo <mattia at debian.org>
 #                Juliana Oliveira Rodrigues <juliana.orod at gmail.com>
@@ -147,11 +147,11 @@ fi
 
 $ROOTCMD sed -i 's/^#PACKAGER\s*=.*/PACKAGER="Reproducible Arch Linux tests"/' /etc/makepkg.conf
 
-$ROOTCMD sed -i "s|^#XferCommand = /usr/bin/curl -C -|XferCommand = /usr/bin/curl -C - --proxy $http_proxy|" /etc/pacman.conf
+$ROOTCMD sed -i "s|^#XferCommand = /usr/bin/curl|XferCommand = /usr/bin/curl --proxy $http_proxy|" /etc/pacman.conf
 if [ "$HOSTNAME" = "profitbricks-build4-amd64" ] ; then
 	# disable signature verification so packages won't fail to install when setting the time to +$x years
 	$ROOTCMD sed -i -E 's/^#?SigLevel\s*=.*/SigLevel = Never/g' /etc/pacman.conf
-	$ROOTCMD sed -i "s|^XferCommand = /usr/bin/curl -C -|XferCommand = /usr/bin/curl --insecure -C -|" /etc/pacman.conf
+	$ROOTCMD sed -i "s|^XferCommand = /usr/bin/curl|XferCommand = /usr/bin/curl --insecure|" /etc/pacman.conf
 	# Disable SSL cert checking for future builds
 	$ROOTCMD sed -i "s|/usr/bin/curl |/usr/bin/curl -k |" /etc/makepkg.conf
 fi



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/be8fc3f5976f77f9c051ddcf41ac1b6f32baaa58

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/be8fc3f5976f77f9c051ddcf41ac1b6f32baaa58
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/20181114/4cec47f1/attachment-0001.html>