pld-builder.new (WORKING): client/make-request.sh - add $default_b...

[glen]

Author: glen                         Date: Wed Apr 12 14:07:29 2006 GMT
Module: pld-builder.new               Tag: WORKING
---- Log message:
- add $default_branch support

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

---- Diffs:

================================================================
Index: pld-builder.new/client/make-request.sh
diff -u pld-builder.new/client/make-request.sh:1.19.2.4 pld-builder.new/client/make-request.sh:1.19.2.5
--- pld-builder.new/client/make-request.sh:1.19.2.4	Fri Jan 13 14:33:57 2006
+++ pld-builder.new/client/make-request.sh	Wed Apr 12 16:07:24 2006
@@ -7,6 +7,7 @@
 flags=
 command=
 command_flags=
+default_branch='HEAD'
 
 if [ -n "$HOME_ETC" ]; then
 	USER_CFG=$HOME_ETC/.requestrc
@@ -25,6 +26,7 @@
 builder_email=builder-ac at pld-linux.org
 mailer="/usr/sbin/sendmail -t"
 default_builders="ac-*"
+#default_branch="AC-branch"
 
 # defaults:
 build_mode=ready
@@ -149,7 +151,7 @@
       ;;
 
     * )
-      specs="$specs $1:HEAD"
+      specs="$specs $1:$default_branch"
       ;;
   esac
   shift
@@ -223,6 +225,7 @@
     [ "$fid" = "" ] && fid="$bid"
     name=$(echo "$s" | sed -e 's|:.*||')
     branch=$(echo "$s" | sed -e 's|.*:||')
+	echo >&2 "* Adding $name:$branch"
     echo "     <spec>$name</spec>"
     echo "     <branch>$branch</branch>"
     echo "     <info></info>"
@@ -246,6 +249,9 @@
 }
 
 gen_email () {
+	# make request first, so the STDERR/STDOUT streams won't be mixed
+	local req=$(gen_req)
+
 cat <<EOF
 From: $requester
 To: $builder_email
@@ -254,7 +260,7 @@
 X-New-PLD-Builder: request
 X-Requester-Version: \$Id$
 
-$(gen_req | gpg --clearsign --default-key $default_key)
+$(echo "$req" | gpg --clearsign --default-key $default_key)
 EOF
 }
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-builder.new/client/make-request.sh?r1=1.19.2.4&r2=1.19.2.5&f=u