Merge branch 'master' of https://projects.parabolagnulinux.org/dbscripts

Conflicts:
	config

1 files changed, 18 insertions, 25 deletions

diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index b29b396..5e228fc 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -22,10 +22,10 @@ find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort
 pushd "${SVNREPO}" >/dev/null
 
 for repo in ${PKGREPOS[@]}; do
-    failedpkgs=()
+    msg "Sourceballing [${repo}]"
 
     pushd $repo >/dev/null
-    find . -maxdepth 1 -type d | while read pkg; do
+    find -maxdepth 1 -type d | while read pkg; do
         pushd "${SVNREPO}/$repo/$pkg" >/dev/null
 
         [[ ! -e PKGBUILD ]] && {
@@ -33,35 +33,33 @@ for repo in ${PKGREPOS[@]}; do
             continue
         }
 
-        unset pkgbase pkgname
+# Unset the previous data
+        unset pkgbase pkgname pkgver pkgrel
         source PKGBUILD
+
+        unset build package url pkgdesc source md5sums depends makedepends \
+              optdepends license arch options check mksource
+
+        for _pkg in ${pkgname[@]}; do
+            unset package_${_pkg} >/dev/null 2>&1
+        done
+
         pkgbase=${pkgbase:-$pkgname}
+        srcfile="${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}"
 
-		echo "${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" >> "${WORKDIR}/expected-src-pkgs"
+		echo "${srcfile}" >> "${WORKDIR}/expected-src-pkgs"
 
         # Skip already sourceballed
-        [[ -e "${SRCPKGDEST}/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" ]] && \
-            continue
+        [ -e "${SRCPKGDEST}/${srcfile}" ] && continue
 
-        msg2 "$pkgbase-$pkgver-$pkgrel..."
-        makepkg --allsource --ignorearch -c
         makepkg --allsource --ignorearch -c >/dev/null 2>&1
 
-        [[ $? -ne 0 ]] && {
-            warning "Failed."
-            failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}"
-        }
+        [ $? -ne 0 ] && plain ${srcfile}
 
-    done
+    done # end find pkgs
     popd >/dev/null
 
-    if [ ${#failedpkgs[@]} -ge 1 ]; then
-        msg "Failed to create source packages for [${repo}]..."
-        for failed_pkg in ${failedpkgs[@]}; do
-            msg2 "${failed_pkg}"
-        done
-    fi
-done
+done # end repos
 
 # Cleanup old source packages
 cat "${WORKDIR}/expected-src-pkgs" | sort -u > "${WORKDIR}/expected-src-pkgs.sort"
@@ -89,10 +87,5 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
-msg "Failed"
-for _fail in ${failedpkgs[@]}; do
-    msg2 "$_fail"
-done
-
 script_unlock