pld-builder.new: client/make-request.sh - allow sending commands and build ...

[glen]

Author: glen                         Date: Sun Feb 27 11:05:01 2011 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- allow sending commands and build jobs in same batch

---- Files affected:
pld-builder.new/client:
   make-request.sh (1.86 -> 1.87) 

---- Diffs:

================================================================
Index: pld-builder.new/client/make-request.sh
diff -u pld-builder.new/client/make-request.sh:1.86 pld-builder.new/client/make-request.sh:1.87
--- pld-builder.new/client/make-request.sh:1.86	Thu Feb  3 13:39:15 2011
+++ pld-builder.new/client/make-request.sh	Sun Feb 27 12:04:54 2011
@@ -531,14 +531,8 @@
 	ok=1
 done
 
-if [ "$ok" = "" ] ; then
-	if [ -z "$command" ]; then
-		die "no specs passed"
-	fi
-else
-	if [ "$command" != "" ] ; then
-		die "cannot pass specs and --command"
-	fi
+if [ -z "$specs" -a -z "$command" ]; then
+	die "no packages to build or command to invoke specified"
 fi
 
 id=$(uuidgen)
@@ -561,7 +555,17 @@
 	echo >&2 "* Queue-ID: $id"
 	echo
 
-	if [ "$command" != "" ] ; then
+	# job to depend on
+	local depend=
+	local b i=1
+	local name branch builders_xml
+
+	for b in $builders; do
+		echo >&2 "* Builder: $b"
+		builders_xml="$builders_xml <builder>$b</builder>"
+	done
+
+	if [ "$command" ]; then
 		bid=$(uuidgen)
 		echo -E >&2 "* Command: $command"
 		echo "	<batch id='$bid' depends-on=''>"
@@ -569,32 +573,24 @@
 		echo -E "$command" | sed -e 's,&,\&,g;s,<,\<,g;s,>,\>,g'
 		echo "</command>"
 		echo "		 <info></info>"
-		local b
-		for b in $builders; do
-			echo >&2 "* Builder: $b"
-			echo "		 <builder>$b</builder>"
-		done
+		echo "$builders_xml"
 		echo "	</batch>"
-	else
+		depend=$bid
+	fi
 
 		if [ "$f_upgrade" = "yes" ] ; then
 			echo >&2 "* Upgrade mode: $f_upgrade"
 		fi
 
-		# job to depend on
-		local depend=
-		local b i=1
-		local name branch
-		for b in $builders; do
-			echo >&2 "* Builder: $b"
-		done
-
 		for s in $specs; do
 			# skip marker
-			if [ "$s" = "^" ] || [ "$no_depend" = yes ]; then
+			if [ "$s" = "^" ]; then
 				depend=
 				continue
 			fi
+			if [ "$no_depend" = yes ]; then
+				depend=
+			fi
 			bid=$(uuidgen)
 			echo "	<batch id='$bid' depends-on='$depend'>"
 
@@ -614,16 +610,13 @@
 				echo "		 <without>$b</without>"
 			done
 			echo
-			for b in $builders; do
-				echo "		 <builder>$b</builder>"
-			done
+			echo "$builders_xml"
 			echo "	</batch>"
 			i=$((i+1))
 
 			# let next job depend on previous
 			depend=$bid
 		done
-	fi
 
 	echo "</group>"
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/client/make-request.sh?r1=1.86&r2=1.87&f=u