[packages/rpm-build-tools/merge-pld-builder-client: 2229/2675] Rewrite parser of spec:branch syntax

glen glen at pld-linux.org
Mon Dec 19 22:03:22 CET 2016


commit 35a9def022db67452aede2d85fa1966027612710
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.

 make-request.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/make-request.sh b/make-request.sh
index e70d474..bd9fce3 100755
--- a/make-request.sh
+++ b/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`
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/cca6584b96e6c33d0732d559e43e100d804e2ecd



More information about the pld-cvs-commit mailing list