Author: glen Date: Mon Feb 8 20:37:35 2010 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- different approach: skip command into shell commands
---- Files affected:
pld-builder.new/client:
make-request.sh (1.68 -> 1.69)
---- Diffs:
================================================================
Index: pld-builder.new/client/make-request.sh
diff -u pld-builder.new/client/make-request.sh:1.68
pld-builder.new/client/make-request.sh:1.69
--- pld-builder.new/client/make-request.sh:1.68 Sun Feb 7 16:53:01 2010
+++ pld-builder.new/client/make-request.sh Mon Feb 8 21:37:30 2010
@@ -182,10 +182,7 @@
;;
-s|--skip)
- f_upgrade=no
- build_mode=test
- priority=-1
- skip=$2
+ skip="$2"
shift
;;
@@ -329,6 +326,16 @@
;;
esac
+# need to do this after distro selection
+if [ "$skip" ]; then
+ f_upgrade=no
+ build_mode=test
+ priority=-1
+ command="skip:$skip"
+ command_flags="no-chroot"
+ builders="$distro-src"
+fi
+
branch=${branch:-$default_branch}
specs=`for s in $specs; do
@@ -379,7 +386,7 @@
done
if [ "$ok" = "" ] ; then
- if [ -z "$command" -a -z "$skip" ]; then
+ if [ -z "$command" ]; then
die "no specs passed"
fi
else
@@ -410,16 +417,6 @@
for b in $builders; do
echo >&2 "* Builder: $b"
echo " <builder>$b</builder>"
- done
- echo " </batch>"
-
- elif [ "$skip" ]; then
- bid=$(uuidgen)
- echo " <batch id='$bid' depends-on=''>"
- for s in {$skip,}; do
- [ "$s" ] || continue
- echo >&2 "* Skip: $s"
- echo "<skip>$s</skip>"
done
echo " </batch>"
else
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/client/make-request.sh?r1=1.68&r2=1.69&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
