[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: Patch to fix EPEL dep scripts



Once more with feeling :)


Testing should be fairly simple.  Just run it and disable emails.
Also, you need a good yum.conf, and rc-report-epel.cfg.  The
checkEpel.sh script will look in the current directory, since that's
how the git directory was setup.


stahnma
From 76e80c31c18c97f53cac854db868cbfa191b5e53 Mon Sep 17 00:00:00 2001
From: stahnma <stahnma fedoraproject org>
Date: Mon, 3 Nov 2008 23:26:02 +0000
Subject: [PATCH] Fixing i386 vs i686 issue.  Also, single email now instead of 6.

---
 scripts/epel-repoclosure/checkEpel.sh |   42 +++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/scripts/epel-repoclosure/checkEpel.sh b/scripts/epel-repoclosure/checkEpel.sh
index 14f4fc7..1e59e2a 100755
--- a/scripts/epel-repoclosure/checkEpel.sh
+++ b/scripts/epel-repoclosure/checkEpel.sh
@@ -1,35 +1,47 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-YUM_CONF_LOC=/etc/yum.repos.d/yum.epel.conf
+YUM_CONF_LOC=yum.epel.conf
 OUTPUT_DIR=$HOME
-RC_REPORT_CFG=/etc/rc-report-epel.cfg
+RC_REPORT_CFG=./rc-report-epel.cfg
+PATH=$PATH:.
+
+OUTFILE=./epel-deps-$DATE.txt
+>$OUTFILE
+
+SEND_EMAIL="yes"
+
 
 process_deps()
 {
     release=$1
     arch=$2
     testing=$3
-    mail=$4
-    [ -z $4 ] && mail="no" || mail="yes"
     [ $arch = "ppc" ] && arch_label=ppc64 || arch_label=$arch
-    command="/usr/local/bin/rc-modified -d mdcache -n -c $YUM_CONF_LOC -a $arch_label -r rhel-$release-$arch -r fedora-epel-$release-$arch -r buildsys-$release-$arch -r rhel-$arch-server-productivity-$release"
+    [ $arch = "i386" ] && arch_label=i686  || arch_label=$arch
+    command="rc-modified -d mdcache -n -c $YUM_CONF_LOC -a $arch_label -r rhel-$release-$arch -r fedora-epel-$release-$arch -r buildsys-$release-$arch -r rhel-$arch-server-productivity-$release"
     [ $release -eq 5 ] && command="$command -r rhel-$release-$arch-vt "
     [ "$testing" =  "testing" ] && command="$command -r fedora-epel-testing-$release-$arch "
-    OUTFILE=$OUTPUT_DIR/epel${release}${arch}-$DATE.txt
-    $command > $OUTFILE
-    [ "$4" = "yes" ] && /usr/local/bin/rc-report.py $OUTFILE -k epel -c $RC_REPORT_CFG -w testing -m summary -m owner
+    $command >> $OUTFILE
 }
 
+mailer()
+{
+    rc-report.py $OUTFILE -k epel -c $RC_REPORT_CFG -w testing -m summary -m owner
+}
 
-# process_deps RHEL_RELEASE ARCH INCLUDE_TESTING? MAIL?
+# process_deps RHEL_RELEASE ARCH INCLUDE_TESTING? 
 
 # RHEL 5
-process_deps 5 i386 testing yes
-process_deps 5 x86_64 testing yes
-process_deps 5 ppc testing yes
+process_deps 5 i386 testing 
+process_deps 5 x86_64 testing
+process_deps 5 ppc testing 
 
 # RHEL 4
-process_deps 4 i386 testing yes
-process_deps 4 x86_64 testing yes
-process_deps 4 ppc testing yes
+process_deps 4 i386 testing 
+process_deps 4 x86_64 testing 
+process_deps 4 ppc testing 
+
+if [ "$SEND_EMAIL" = "yes" ] ; then
+   mailer
+fi
-- 
1.5.5.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]