[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Revert "YOLO fixup for 88ff3aaf: reproducible Debian: add support for common-$DPKG_ARCH files"

[Holger Levsen]

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


Commits:
134df78f by Holger Levsen at 2018-04-20T22:59:04-03:00
Revert "YOLO fixup for 88ff3aaf: reproducible Debian: add support for common-$DPKG_ARCH files"

This reverts commit 8ab28c5caac2320c9e0de9a6afb4914f1f627665.

- - - - -
624a7f2f by Holger Levsen at 2018-04-20T23:01:14-03:00
reproducible Debian: always run apt-get update (but sometimes only update sources.list later...)

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
@@ -495,7 +495,7 @@ if [ -f /etc/debian_version ] ; then
 		else
 			MASTERDEBS=""
 		fi
-		$UP2DATE || ( sudo cp --preserve=mode,timestamps -r hosts/$HOSTNAME/etc/apt/sources.list /etc/apt ; sudo apt-get update )
+		$UP2DATE || sudo apt-get update
 		$UP2DATE || sudo apt-get install $DEBS $MASTERDEBS
 		# dont (re-)install pbuilder if it's on hold
 		if [ "$(dpkg-query -W -f='${db:Status-Abbrev}\n' pbuilder)" != "hi " ] ; then
@@ -555,7 +555,7 @@ for h in common common-amd64 common-i386 common-arm64 common-armhf "$HOSTNAME" ;
 	fi
 	for d in etc usr ; do
 		if [ -d "hosts/$h/$d" ]; then
-			sudo cp --preserve=mode,timestamps -r "hosts/$h/$d/"* "/$d" || true # YOLO or better use src:fai's fcopy
+			sudo cp --preserve=mode,timestamps -r "hosts/$h/$d/"* "/$d"
 		fi
 	done
 done



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/5c0becb71394c918ed34aa0659dfa4b46b7813c9...624a7f2f4331cfebd303ad0853a22bd6824da83d

---
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/5c0becb71394c918ed34aa0659dfa4b46b7813c9...624a7f2f4331cfebd303ad0853a22bd6824da83d
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/53fc8193/attachment-0001.html>