From e7fe897a91e6376a8724c226f8e078251620a173 Mon Sep 17 00:00:00 2001
From: Eric Bélanger <snowmaniscool@gmail.com>
Date: Mon, 8 Feb 2010 10:13:42 -0500
Subject: sourceballs: Make cleanup more efficient
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Moved all cleanup related code in sourceballs-cleanup script and moved,
now common, functions in db-functions.  The cleanup script is now ran
after all the new sourceballs have been fetched.

Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
---
 misc-scripts/make-sourceball | 54 --------------------------------------------
 1 file changed, 54 deletions(-)

(limited to 'misc-scripts/make-sourceball')

diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball
index 8899fca..610d7f1 100755
--- a/misc-scripts/make-sourceball
+++ b/misc-scripts/make-sourceball
@@ -40,27 +40,6 @@ die() {
     cleanup 1
 }
 
-pkgname_from_src() {
-    local tmp
-    tmp=${1##*/}
-    tmp=${tmp%$SRCEXT}
-    for a in ${ARCHES[@]}; do
-        tmp=${tmp%-$a}
-    done
-    tmp=${tmp%-any}
-    echo ${tmp%-*-*}
-}
-
-pkgver_from_src() {
-    tmp=${1##*/}
-    tmp=${tmp%$SRCEXT}
-    for a in ${ARCHES[@]}; do
-        tmp=${tmp%-$a}
-    done
-    tmp=${tmp%-any}
-    echo $tmp | sed 's|.*-\(.*-.*\)$|\1|g'
-}
-
 create_srcpackage() {
     if [ -d "$1" ]; then
         pushd "$1" >/dev/null
@@ -94,38 +73,6 @@ create_srcpackage() {
     fi
 }
 
-remove_old() {
-    if [ -d "$1" ]; then
-        pushd "$1" >/dev/null
-        PKGVERS=""
-        for repo in *; do
-            cd "$repo"
-            . "$BUILDSCRIPT"
-            PKGVERS="$PKGVERS $pkgver-$pkgrel"
-            cd ..
-        done
-
-        for srcpkg in "$srcpath/$packagename-"*; do
-            [ -f "$srcpkg" ] || continue
-            if [ "$(pkgname_from_src $srcpkg)" == "$packagename" ]; then
-                skip=0
-                pver="$(pkgver_from_src $srcpkg)"
-                for v in $PKGVERS; do
-                    if [ "$v" = "$pver" ]; then
-                        skip=1
-                        break
-                    fi
-                done
-                if [ $skip -ne 1 ]; then 
-                    mv "$srcpkg" $SOURCE_CLEANUP_DESTDIR
-                fi
-            fi
-        done
-
-        popd >/dev/null
-    fi
-}
-
 trap ctrl_c 2
 trap cleanup 0 1
 
@@ -135,7 +82,6 @@ set_umask
 cd "$WORKDIR"
 
 if /usr/bin/svn export -q "$SVNREPO/$packagename" $packagename; then
-    remove_old "$packagename/repos/"
     create_srcpackage "$packagename/repos/$reponame-$_arch"
 else
     die "\tPackage '$packagename' does not exist in repo '$reponame-$_arch'"
-- 
cgit v1.2.3-24-g4f1b