From 444dcf9fd28b81c3c9a63dfedae14f795b84b82c Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 27 Jul 2015 12:17:25 +0200 Subject: reproducible: update_if_similar(): sort and remove duplicates from list --- bin/reproducible_create_meta_pkg_sets.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh index 3f25d50a..3fb89f3e 100755 --- a/bin/reproducible_create_meta_pkg_sets.sh +++ b/bin/reproducible_create_meta_pkg_sets.sh @@ -41,6 +41,8 @@ update_if_similar() { # this is mostly done to not accidently overwrite the lists # with garbage, eg. when external services are down if [ -s $TMPFILE ] ; then + sort -u $TMPFILE > ${TMPFILE2} + mv ${TMPFILE2} $TMPFILE TARGET=$TPATH/$1 if [ -f $TARGET ] ; then LENGTH=$(cat $TARGET | wc -w) @@ -147,8 +149,7 @@ update_pkg_sets() { | schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-create-graph --quiet --deb-native-arch="$ARCH" --strongtype --bg "$SOURCES" "$PACKAGES" - \ | schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-buildgraph2packages - "$PACKAGES" \ | schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-bin2src --deb-native-arch="$ARCH" - "$SOURCES" \ - | grep-dctrl --no-field-names --show-field=Package '' \ - | sort -u > $TMPFILE + | grep-dctrl --no-field-names --show-field=Package '' update_if_similar ${META_PKGSET[4]}.pkgset fi @@ -187,9 +188,8 @@ update_pkg_sets() { if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[8]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[8]}.pkgset ] ; then rm -f ${TMPFILE2} svn export svn://svn.debian.org/svn/secure-testing/data/DSA/list ${TMPFILE2} - grep "^\[" ${TMPFILE2} | grep "DSA-" | cut -d " " -f5|sort -u > $TMPFILE + grep "^\[" ${TMPFILE2} | grep "DSA-" | cut -d " " -f5 > $TMPFILE update_if_similar ${META_PKGSET[8]}.pkgset - rm -f ${TMPFILE2} fi # packages from the cii-census -- cgit v1.2.3-54-g00ecf