From db00ce3c343cf6eea9cb512f7bba9ea7904526b8 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sat, 21 Feb 2009 13:43:23 -0800 Subject: Add a script to simplify the integ check call Signed-off-by: Aaron Griffin --- cron-jobs/integrity-check | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 cron-jobs/integrity-check (limited to 'cron-jobs/integrity-check') diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check new file mode 100755 index 0000000..c3b016c --- /dev/null +++ b/cron-jobs/integrity-check @@ -0,0 +1,14 @@ +#!/bin/bash + +basedir="$(dirname $0)" + +if [ $# -ne 3 ]; then + echo "usage: $(basename $0) [,,...] " >2 + exit 1 +fi + +$basedir/cron-jobs/check_archlinux/check_packages.py \ + --repos="$1" \ + --abs-tree="/srv/abs/rsync/$2" --arch="$1" |\ + $basedir/cron-jobs/devlist-mailer \ + "Integrity Check $2: $1" "$3" -- cgit v1.2.3-2-g168b From 0d3c5671c27f0b5848bb72df9af2270f72e7c988 Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Sat, 21 Feb 2009 17:16:17 -0800 Subject: integrity-check: fix a few errors I think it will work better now :) Signed-off-by: Xavier Chantry Signed-off-by: Aaron Griffin --- cron-jobs/integrity-check | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'cron-jobs/integrity-check') diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check index c3b016c..0b59064 100755 --- a/cron-jobs/integrity-check +++ b/cron-jobs/integrity-check @@ -3,12 +3,11 @@ basedir="$(dirname $0)" if [ $# -ne 3 ]; then - echo "usage: $(basename $0) [,,...] " >2 + echo "usage: $(basename $0) [,,...] " >&2 exit 1 fi -$basedir/cron-jobs/check_archlinux/check_packages.py \ +$basedir/check_archlinux/check_packages.py \ --repos="$1" \ - --abs-tree="/srv/abs/rsync/$2" --arch="$1" |\ - $basedir/cron-jobs/devlist-mailer \ - "Integrity Check $2: $1" "$3" + --abs-tree="/srv/abs/rsync/$2" --arch="$2" |\ + $basedir/devlist-mailer "Integrity Check $2: $1" "$3" -- cgit v1.2.3-2-g168b From a46bca9a39b37e7574f87468ddc5fb9b9577786e Mon Sep 17 00:00:00 2001 From: Henning Garus Date: Tue, 1 Sep 2009 23:54:47 +0200 Subject: check_packages.py: Allow multiple abs-trees By parsing multiple abs trees we can add any when parsing the other trees, checking any standalone doesn't make much sense. Signed-off-by: Henning Garus Signed-off-by: Xavier Chantry Signed-off-by: Aaron Griffin --- cron-jobs/integrity-check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cron-jobs/integrity-check') diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check index 0b59064..b3185ec 100755 --- a/cron-jobs/integrity-check +++ b/cron-jobs/integrity-check @@ -9,5 +9,5 @@ fi $basedir/check_archlinux/check_packages.py \ --repos="$1" \ - --abs-tree="/srv/abs/rsync/$2" --arch="$2" |\ + --abs-tree="/srv/abs/rsync/$2,/srv/abs/rsync/any" --arch="$2" |\ $basedir/devlist-mailer "Integrity Check $2: $1" "$3" -- cgit v1.2.3-2-g168b From 496fc1c7f54132410af5fd84bfe10b8e68d02a1e Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 18 Sep 2009 17:33:26 -0400 Subject: integrity-check: Loop over arches THis simplifies the command line and we do both anyway Signed-off-by: Aaron Griffin --- cron-jobs/integrity-check | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'cron-jobs/integrity-check') diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check index b3185ec..8f23129 100755 --- a/cron-jobs/integrity-check +++ b/cron-jobs/integrity-check @@ -3,11 +3,13 @@ basedir="$(dirname $0)" if [ $# -ne 3 ]; then - echo "usage: $(basename $0) [,,...] " >&2 + echo "usage: $(basename $0) [,,...] " >&2 exit 1 fi -$basedir/check_archlinux/check_packages.py \ - --repos="$1" \ - --abs-tree="/srv/abs/rsync/$2,/srv/abs/rsync/any" --arch="$2" |\ - $basedir/devlist-mailer "Integrity Check $2: $1" "$3" +for arch in i686 x86_64; do + $basedir/check_archlinux/check_packages.py \ + --repos="$1" \ + --abs-tree="/srv/abs/rsync/$arch,/srv/abs/rsync/any" --arch="$arch" |\ + $basedir/devlist-mailer "Integrity Check $arch: $1" "$3" +done -- cgit v1.2.3-2-g168b From 17e96ac3d2505ed8841ff9240492e7378472d364 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 18 Sep 2009 18:18:44 -0400 Subject: integrity-check: Forgot to decrement the arg count Signed-off-by: Aaron Griffin --- cron-jobs/integrity-check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cron-jobs/integrity-check') diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check index 8f23129..c2546de 100755 --- a/cron-jobs/integrity-check +++ b/cron-jobs/integrity-check @@ -2,7 +2,7 @@ basedir="$(dirname $0)" -if [ $# -ne 3 ]; then +if [ $# -ne 2 ]; then echo "usage: $(basename $0) [,,...] " >&2 exit 1 fi -- cgit v1.2.3-2-g168b From d7f1242883aea50023931447c3c2f527528084b3 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 18 Sep 2009 18:26:02 -0400 Subject: integrity-check: Rename $3 -> $2 OMFG such a simple script and I keep missing crap Signed-off-by: Aaron Griffin --- cron-jobs/integrity-check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cron-jobs/integrity-check') diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check index c2546de..0b2b9c7 100755 --- a/cron-jobs/integrity-check +++ b/cron-jobs/integrity-check @@ -11,5 +11,5 @@ for arch in i686 x86_64; do $basedir/check_archlinux/check_packages.py \ --repos="$1" \ --abs-tree="/srv/abs/rsync/$arch,/srv/abs/rsync/any" --arch="$arch" |\ - $basedir/devlist-mailer "Integrity Check $arch: $1" "$3" + $basedir/devlist-mailer "Integrity Check $arch: $1" "$2" done -- cgit v1.2.3-2-g168b From 328b1ce478e25902aba5d8f19024dadeaaf3f678 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 1 Sep 2010 19:34:47 +0200 Subject: Simplify repo configuration * Repositories can now be defined in the config file for each host * added community-staging, gnome-unstable and kde-unstable * Exception is the adjust-permission cron-job; but we might want to use acls in future anyway Signed-off-by: Pierre Schmitz --- cron-jobs/integrity-check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cron-jobs/integrity-check') diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check index 0b2b9c7..c120cfd 100755 --- a/cron-jobs/integrity-check +++ b/cron-jobs/integrity-check @@ -7,7 +7,7 @@ if [ $# -ne 2 ]; then exit 1 fi -for arch in i686 x86_64; do +for arch in ${ARCHES[@]}; do $basedir/check_archlinux/check_packages.py \ --repos="$1" \ --abs-tree="/srv/abs/rsync/$arch,/srv/abs/rsync/any" --arch="$arch" |\ -- cgit v1.2.3-2-g168b From 1dca721c5149f69067f38d4a33dabbebef98009b Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 22 Nov 2010 22:41:21 +0100 Subject: Attempt to fix integrity-check --- cron-jobs/integrity-check | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'cron-jobs/integrity-check') diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check index c120cfd..0a8650c 100755 --- a/cron-jobs/integrity-check +++ b/cron-jobs/integrity-check @@ -1,15 +1,16 @@ #!/bin/bash -basedir="$(dirname $0)" +. "$(dirname $0)/../db-functions" +. "$(dirname $0)/../config" + if [ $# -ne 2 ]; then - echo "usage: $(basename $0) [,,...] " >&2 - exit 1 + die "usage: $(basename $0) [,,...] " fi for arch in ${ARCHES[@]}; do - $basedir/check_archlinux/check_packages.py \ + $(dirname $0)/check_archlinux/check_packages.py \ --repos="$1" \ --abs-tree="/srv/abs/rsync/$arch,/srv/abs/rsync/any" --arch="$arch" |\ - $basedir/devlist-mailer "Integrity Check $arch: $1" "$2" + $(dirname $0)/devlist-mailer "Integrity Check $arch: $1" "$2" done -- cgit v1.2.3-2-g168b From 10116f6f0d5a0fe36b8582ed23f193683e4e5523 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 9 Dec 2010 08:28:39 +0100 Subject: Call integrity-check with specific repo list for each architecture --- cron-jobs/integrity-check | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'cron-jobs/integrity-check') diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check index 0a8650c..d4f9694 100755 --- a/cron-jobs/integrity-check +++ b/cron-jobs/integrity-check @@ -1,16 +1,32 @@ #!/bin/bash -. "$(dirname $0)/../db-functions" -. "$(dirname $0)/../config" +dirname="$(dirname $0)" +. "${dirname}/../db-functions" +. "${dirname}/../config" -if [ $# -ne 2 ]; then - die "usage: $(basename $0) [,,...] " +script_lock + +if [ $# -ne 1 ]; then + die "usage: $(basename $0) " fi +mailto=$1 + +check() { + ${dirname}/check_archlinux/check_packages.py \ + --repos="${repos}" \ + --abs-tree="/srv/abs/rsync/${arch},/srv/abs/rsync/any" \ + --repo-dir="${FTP_BASE}" \ + --arch="${arch}" \ + 2>&1 | ${dirname}/devlist-mailer "Integrity Check ${arch}: ${repos}" "${mailto}" +} + +repos='core,extra,community' +arch='i686' +check + +repos='core,extra,community,multilib' +arch='x86_64' +check -for arch in ${ARCHES[@]}; do - $(dirname $0)/check_archlinux/check_packages.py \ - --repos="$1" \ - --abs-tree="/srv/abs/rsync/$arch,/srv/abs/rsync/any" --arch="$arch" |\ - $(dirname $0)/devlist-mailer "Integrity Check $arch: $1" "$2" -done +script_unlock -- cgit v1.2.3-2-g168b