Fixed test for existence of split package sources

This patch also removes the unused CARCH variable.

Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
[Aaron: Broke srcpkgbase logic into srcpkgname/srcpkgbase
 to make it more readable]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index f285d7f..09b1df7 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -41,7 +41,6 @@ echo "Errors occured during run:" > "$srcbase/errors.txt"
 
 for repo in $repos; do
     for arch in ${ARCHES[@]} any; do
-        export CARCH="$arch"
         ftppath="$ftpbase/$repo/os/$arch"
         if [ ! -d "$ftppath" ]; then
             echo "FTP path does not exist: $ftppath" >2
@@ -54,6 +53,8 @@ for repo in $repos; do
             srcpath="$srcbase/"
             srcpkg="${pkg//$PKGEXT/$SRCEXT}"
             srcpkg="${srcpkg//-$arch/}"
+            srcpkgname="${srcpkg%-*-*$SRCEXT}"
+            srcpkgbase="${srcpkg/$srcpkgname/$pkgbase}"
 
             #Don't do anything for package in this 'blacklist'
             if grep "^$pkgbase\$" "$dirname/sourceballs.skip" >/dev/null 2>&1; then
@@ -67,7 +68,7 @@ for repo in $repos; do
                 force="-f"
             fi
 
-            if [ ! -f "$srcpath$srcpkg" ]; then
+            if [ ! \( -f "$srcpath$srcpkg" -o -f "$srcpath$srcpkgbase" \) ]; then
                 if ! $dirname/../misc-scripts/make-sourceball $force \
                     $pkgbase $repo $arch 2>>"$srcbase/errors.txt"; then
                     FAILED_PKGS="$FAILED_PKGS $pkg"