From de547b70c1b3f6dfc163d96318d6f915446bbc4c Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Thu, 24 Sep 2009 15:01:08 -0700 Subject: Fixed test for existence of split package sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch also removes the unused CARCH variable. Signed-off-by: Eric Bélanger [Aaron: Broke srcpkgbase logic into srcpkgname/srcpkgbase to make it more readable] Signed-off-by: Aaron Griffin --- cron-jobs/sourceballs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cron-jobs') 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" -- cgit v1.2.3-24-g4f1b