X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kde4send2builders.sh;h=eb4f78f11cf5d6b1275750cfc6e58f331614a1a3;hb=d149169bd80f434657a6a13d2104ac3d879ed095;hp=8d5af6dffb69c92a417134ba847e3f87edb800a1;hpb=eab531319357178bd111c8b86dc2f321114a2b6e;p=packages%2Frpm-build-tools.git

diff --git a/kde4send2builders.sh b/kde4send2builders.sh
index 8d5af6d..eb4f78f 100755
--- a/kde4send2builders.sh
+++ b/kde4send2builders.sh
@@ -16,13 +16,15 @@ usage() {
 	echo "  -b   --builder VALUE"
 	echo "     choose a particular builder, default all"
 	echo "  -p   --priority VALUE (default: 2)"
+	echo "  -s   --skip-pull (default: no)"
+	echo "     skip git pull when getting autotag"
 	echo "  -h   --help"
 	echo "     show this help"
 	echo ""
 	echo "Choose SPECS out of:"
 	echo ""
 	echo "all - all * (libs, base, other, koffice, l10n)"
-	echo "libs - kdelibs and kdepimlibs kdelibs-experimental"
+	echo "libs - kdelibs and kdepimlibs"
 	echo "base - kdebase* oxygen-icons"
 	echo "other - all other * except libs and base"
 	echo "koffice - koffice"
@@ -38,6 +40,7 @@ ATAG=no
 SENDPRIO=
 BUILDER=
 PRIO=2
+SKIPPULL=0
 #SPECDIR=$(rpm -E %_specdir)
 SPECDIR=~/rpm
 
@@ -120,6 +123,11 @@ while [ $# -gt 0 ]; do
 			PRIO=$2
 			shift
 			;;
+		
+		--skip-pull | -s )
+			SKIPPULL=1
+			shift
+			;;
 
 		--help | -h )
 			usage
@@ -177,7 +185,14 @@ fi
 if [ "$ATAG" == "yes" ]; then
 	for spec in $specs; do
 		PKG=$(echo $spec |sed -e 's/.spec//g')
-		LAST_AUTOTAG=$(cd $SPECDIR/packages && ksh ./builder -g -ns $PKG/$spec >/dev/null 2>&1 && cvs status -v $PKG/$spec | awk -vdist=$disttag '!/Sticky/ && $1 ~ "^auto-" dist "-"{if (!a++) print $1}')
+		if [ ! -d $PKG ]; then
+			git clone git@git.tld-linux.org:packages/${PKG}
+		fi
+		if [ $SKIPPULL -lt 1 ]; then
+			LAST_AUTOTAG=$(cd $PKG && git pull >/dev/null && git tag |tail -n 1)
+		else
+			LAST_AUTOTAG=$(cd $PKG && git tag |tail -n 1)
+		fi
 		sleep 1
 		SENDPRIO="$SENDPRIO $spec:$LAST_AUTOTAG "
 	done