Author: arekm Date: Tue Mar 30 19:29:58 2010 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- reorder
---- Files affected:
pld-builder.new/client:
make-request.sh (1.72 -> 1.73)
---- Diffs:
================================================================
Index: pld-builder.new/client/make-request.sh
diff -u pld-builder.new/client/make-request.sh:1.72
pld-builder.new/client/make-request.sh:1.73
--- pld-builder.new/client/make-request.sh:1.72 Tue Mar 30 21:15:48 2010
+++ pld-builder.new/client/make-request.sh Tue Mar 30 21:29:53 2010
@@ -453,10 +453,15 @@
gen_req() {
echo "<group id='$id' no='0' flags='$flags'>"
echo " <time>$(date +%s)</time>"
+ echo >&2 "* Using priority $priority"
echo " <priority>$priority</priority>"
if [ -n "$jobs" ]; then
+ echo >&2 "* Using jobs $jobs"
echo " <maxjobs>$jobs</maxjobs>"
fi
+ echo >&2 "* Build mode: $build_mode"
+ echo >&2 "* Using email $builder_email"
+ echo >&2 "* Queue-ID: $id"
echo
if [ "$command" != "" ] ; then
@@ -474,50 +479,43 @@
echo " </batch>"
else
- echo >&2 "* Using priority $priority"
- if [ -n "$jobs" ]; then
- echo >&2 "* Using jobs $jobs"
- fi
- echo >&2 "* Using email $builder_email"
- echo >&2 "* Build mode: $build_mode"
- if [ "$f_upgrade" = "yes" ] ; then
- echo >&2 "* Upgrade mode: $f_upgrade"
- fi
- echo >&2 "* Queue-ID: $id"
+ if [ "$f_upgrade" = "yes" ] ; then
+ echo >&2 "* Upgrade mode: $f_upgrade"
+ fi
- # first id:
- fid=
- i=1
+ # first id:
+ fid=
+ i=1
- for b in $builders; do
- echo >&2 "* Builder: $b"
- done
- for s in $specs; do
- bid=$(uuidgen)
- echo " <batch id='$bid' depends-on='$fid'>"
- [ "$fid" = "" ] && fid="$bid"
- name=$(echo "$s" | sed -e 's|:.*||')
- branch=$(echo "$s" | sed -e 's|.*:||')
- echo >&2 "* Adding #$i $name:$branch${kernel:+
alt_kernel=$kernel}${target:+ target=$target}"
- echo " <spec>$name</spec>"
- echo " <branch>$branch</branch>"
- echo " ${kernel:+<kernel>$kernel</kernel>}"
- echo " ${target:+<target>$target</target>}"
- echo " <info></info>"
- echo
- for b in $with; do
- echo " <with>$b</with>"
- done
- for b in $without; do
- echo " <without>$b</without>"
- done
- echo
for b in $builders; do
- echo " <builder>$b</builder>"
+ echo >&2 "* Builder: $b"
+ done
+ for s in $specs; do
+ bid=$(uuidgen)
+ echo " <batch id='$bid' depends-on='$fid'>"
+ [ "$fid" = "" ] && fid="$bid"
+ name=$(echo "$s" | sed -e 's|:.*||')
+ branch=$(echo "$s" | sed -e 's|.*:||')
+ echo >&2 "* Adding #$i $name:$branch${kernel:+
alt_kernel=$kernel}${target:+ target=$target}"
+ echo " <spec>$name</spec>"
+ echo " <branch>$branch</branch>"
+ echo " ${kernel:+<kernel>$kernel</kernel>}"
+ echo " ${target:+<target>$target</target>}"
+ echo " <info></info>"
+ echo
+ for b in $with; do
+ echo " <with>$b</with>"
+ done
+ for b in $without; do
+ echo " <without>$b</without>"
+ done
+ echo
+ for b in $builders; do
+ echo " <builder>$b</builder>"
+ done
+ echo " </batch>"
+ i=$((i+1))
done
- echo " </batch>"
- i=$((i+1))
- done
fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/client/make-request.sh?r1=1.72&r2=1.73&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
