[projects/pld-builder.new] Rewrite parser of spec:branch syntax

draenog draenog at pld-linux.org
Sat Jul 28 20:19:19 CEST 2012


commit e4d71c863233848f975695cf52a4b35a9b0f5731
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Sat Jul 28 19:17:21 2012 +0100

    Rewrite parser of spec:branch syntax
    
    Previous version failed when tags contained slash.

 client/make-request.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/client/make-request.sh b/client/make-request.sh
index e70d474..bd9fce3 100755
--- a/client/make-request.sh
+++ b/client/make-request.sh
@@ -589,17 +589,12 @@ specs=`for s in $specs; do
 		# skip marker - pass it along
 		echo $s
 		;;
-	*.spec:*) # spec with branch
-		basename $s
-		;;
-	*.spec) # spec without branch
-		echo $(basename $s):$branch
-		;;
 	*:*) # package name with branch
-		basename $s | sed -e 's/:/.spec:/'
+		_specfile=$(basename ${s%:*})
+		echo ${_specfile%.spec}.spec:${s##*:}
 		;;
 	*) # just package name
-		echo $(basename $s).spec:$branch
+		echo $(basename ${s%.spec}.spec):$branch
 		;;
 	esac
 done`


More information about the pld-cvs-commit mailing list