[packages/rpm-build-tools/merge-pld-builder-client: 98/2675] - different approach: skip command into shell commands
glen
glen at pld-linux.org
Mon Dec 19 21:57:09 CET 2016
commit b9a4a64b23a2688ab598e2027cfbe0d747a49754
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Mon Feb 8 20:37:30 2010 +0000
- different approach: skip command into shell commands
Changed files:
PLD_Builder/build.py -> 1.14
PLD_Builder/request_handler.py -> 1.51
client/make-request.sh -> 1.69
make-request.sh | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/make-request.sh b/make-request.sh
index a03ae02..d309c79 100644
--- a/make-request.sh
+++ b/make-request.sh
@@ -182,10 +182,7 @@ while [ $# -gt 0 ] ; do
;;
-s|--skip)
- f_upgrade=no
- build_mode=test
- priority=-1
- skip=$2
+ skip="$2"
shift
;;
@@ -329,6 +326,16 @@ aidath)
;;
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 @@ for s in $specs; do
done
if [ "$ok" = "" ] ; then
- if [ -z "$command" -a -z "$skip" ]; then
+ if [ -z "$command" ]; then
die "no specs passed"
fi
else
@@ -412,16 +419,6 @@ gen_req() {
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
echo >&2 "* Using priority $priority"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/cca6584b96e6c33d0732d559e43e100d804e2ecd
More information about the pld-cvs-commit
mailing list