[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible archlinux+rpms: remove useless usage of cat, build rpms in random order

Holger Levsen holger at moszumanska.debian.org
Thu Dec 17 18:39:41 UTC 2015


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 aac25568d86b95872e4620ca2412f26072d28972
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Dec 17 19:39:20 2015 +0100

    reproducible archlinux+rpms: remove useless usage of cat, build rpms in random order
---
 bin/reproducible_build_archlinux_pkg.sh | 4 ++--
 bin/reproducible_build_rpm.sh           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index 17c53c0..9bd9281 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -55,7 +55,7 @@ update_archlinux_repositories() {
 		for REPO in $ARCHLINUX_REPOS ; do
 			if [ ! -f ${ARCHLINUX_PKGS}_$REPO ] || [ $DUMMY -nt ${ARCHLINUX_PKGS}_$REPO ] ; then
 				echo "$(date -u ) - updating list of available packages in repository '$REPO'."
-				schroot --run-session -c $SESSION --directory /var/abs/$REPO -- ls -1|sort -R|xargs echo > ${ARCHLINUX_PKGS}_$REPO
+				schroot --run-session -c $SESSION --directory /var/abs/$REPO -- ls -1|sort -u|xargs echo > ${ARCHLINUX_PKGS}_$REPO
 				echo "$(date -u ) - these packages in repository '$REPO' are known to us:"
 				cat ${ARCHLINUX_PKGS}_$REPO
 			fi
@@ -84,7 +84,7 @@ choose_package() {
 					;;
 		esac
 		touch -d "$(date -d '$MIN_AGE days ago' '+%Y-%m-%d') 00:00 UTC" $DUMMY
-		for PKG in $(cat ${ARCHLINUX_PKGS}_$REPO) ; do
+		for PKG in $(sort -R ${ARCHLINUX_PKGS}_$REPO) ; do
 			# build package if it has never build or at least $MIN_AGE days ago
 			if [ ! -d $BASE/archlinux/$REPO/$PKG ] || [ $DUMMY -nt $BASE/archlinux/$REPO/$PKG ] ; then
 				REPOSITORY=$REPO
diff --git a/bin/reproducible_build_rpm.sh b/bin/reproducible_build_rpm.sh
index 64c7bbd..e73a245 100755
--- a/bin/reproducible_build_rpm.sh
+++ b/bin/reproducible_build_rpm.sh
@@ -71,7 +71,7 @@ choose_package() {
 	fi
 	echo "$(date -u ) - choosing package to be build."
 	local PKG=""
-	for PKG in $(cat ${RPM_PKGS}_$RELEASE) ; do
+	for PKG in $(sort -R ${RPM_PKGS}_$RELEASE) ; do
 		# build package if it has never build or at least $MIN_AGE days ago
 		if [ ! -d $BASE/rpms/$RELEASE/$ARCH/$PKG ] || [ $DUMMY -nt $BASE/rpms/$RELEASE/$ARCH/$PKG ] ; then
 			SRCPACKAGE=$PKG

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