From e343366efd1762336c4c7250dbbf62b7ea0bf47e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 22 Nov 2010 19:55:41 +0100 Subject: sourceballs-cleanup: respect .force and .skip files --- misc-scripts/sourceballs-cleanup | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/misc-scripts/sourceballs-cleanup b/misc-scripts/sourceballs-cleanup index fdb1355..595f501 100755 --- a/misc-scripts/sourceballs-cleanup +++ b/misc-scripts/sourceballs-cleanup @@ -55,6 +55,10 @@ for sourceball in "${FTP_BASE}/${SRCPOOL}"/*$SRCEXT; do packagename=$(basename $sourceball) packagename=${packagename%-*-*$SRCEXT} + if grep -q "^${packagename}\$" "$(dirname $0)/../cron-jobs/sourceballs.skip"; then + msg "$packagename : package found in sourceballs.skip. Removing sourceball." + ${CLEANUP_DRYRUN} || mv $sourceball $SOURCE_CLEANUP_DESTDIR + fi if ! /usr/bin/svn export -q --force "$SVNREPO/$packagename" "$packagename" >/dev/null 2>&1; then if [ $? -ne 1 ]; then error "$packagename : svn died during export. Skipping sourceball." @@ -66,8 +70,10 @@ for sourceball in "${FTP_BASE}/${SRCPOOL}"/*$SRCEXT; do warning "$packagename : no longer in repos but trunk is still in svn. Removing sourceball." ${CLEANUP_DRYRUN} || mv $sourceball $SOURCE_CLEANUP_DESTDIR elif ! chk_license $(. "$packagename/trunk/PKGBUILD"; echo ${license[@]}); then - msg "$packagename : source hosting no longer required by license. Removing sourceball." - ${CLEANUP_DRYRUN} || mv $sourceball $SOURCE_CLEANUP_DESTDIR + if ! grep -q "^${packagename}\$" "$(dirname $0)/../cron-jobs/sourceballs.force"; then + msg "$packagename : source hosting no longer required by license. Removing sourceball." + ${CLEANUP_DRYRUN} || mv $sourceball $SOURCE_CLEANUP_DESTDIR + fi else remove_old "$packagename/repos/" fi -- cgit v1.2.3-24-g4f1b