From cf642f924a4404f85926619324e59b3c878c1284 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 21 Nov 2010 13:59:30 +0100
Subject: sourceballs: Support any packages

---
 misc-scripts/make-sourceball | 11 ++++++++---
 test/runTest                 | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball
index fccc4b5..ce87b31 100755
--- a/misc-scripts/make-sourceball
+++ b/misc-scripts/make-sourceball
@@ -62,8 +62,6 @@ create_srcpackage() {
         popd >/dev/null
 
         return 0
-    else
-        error "PKGBUILD not found in $1"
     fi
 }
 
@@ -73,7 +71,14 @@ cd "$WORKDIR"
 failed=0
 
 if /usr/bin/svn export -q "$SVNREPO/$packagename" $packagename; then
-  create_srcpackage "$packagename/repos/$reponame-$arch" || failed=1
+  if [ -f "$packagename/repos/$reponame-$arch/PKGBUILD" ]; then
+    create_srcpackage "$packagename/repos/$reponame-$arch" || failed=1
+  elif [ -f "$packagename/repos/$reponame-any/PKGBUILD" ]; then
+    create_srcpackage "$packagename/repos/$reponame-any" || failed=1
+  else
+    error "PKGBUILD for '$packagename' does not exist in repo '$reponame-$arch' or '$reponame-any'"
+    failed=1
+  fi
 else
   error "Package '$packagename' does not exist in repo '$reponame-$arch'"
   failed=1
diff --git a/test/runTest b/test/runTest
index 6c60ddc..fe22ce7 100755
--- a/test/runTest
+++ b/test/runTest
@@ -558,6 +558,21 @@ testSourceballs() {
 	done
 }
 
+testAnySourceballs() {
+	local pkgs=('pkg-any-a' 'pkg-any-b')
+	local pkgbase
+
+	for pkgbase in ${pkgs[@]}; do
+		releasePackage extra ${pkgbase} any
+	done
+	../db-update
+
+	../cron-jobs/sourceballs
+	for pkgbase in ${pkgs[@]}; do
+		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
+	done
+}
+
 testSourceballsCleanup() {
 	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
-- 
cgit v1.2.3-24-g4f1b