[packages/rpm-build-tools/merge-pld-builder-client: 118/2675] - invoke poldek twice, so broken sources won't omit whole upgrade - correct details which notify mod

[glen]

commit 0d7624ef038d672d0dd82559f90d8c4561a8c792
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Sep 6 15:20:03 2010 +0000

    - invoke poldek twice, so broken sources won't omit whole upgrade
    - correct details which notify mode being used
    
    Changed files:
        client/make-request.sh -> 1.81

 make-request.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/make-request.sh b/make-request.sh
index e979e82..14f653c 100644
--- a/make-request.sh
+++ b/make-request.sh
@@ -484,7 +484,7 @@ if [ "$df_fetch" = "yes" ]; then
 fi
 
 if [ "$upgrade_macros" = "yes" ]; then
-	command="poldek --up -Uv rpm-build-macros"
+	command="poldek --up; poldek -Uv rpm-build-macros"
 	builders="$distro-src"
 	f_upgrade=no
 	build_mode=test
@@ -542,7 +542,11 @@ gen_req() {
 		echo "	<maxjobs>$jobs</maxjobs>"
 	fi
 	echo >&2 "* Build mode: $build_mode"
-	echo >&2 "* Using email $builder_email"
+	if [ -z "$url" ]; then
+		echo >&2 "* Using email $builder_email"
+	else
+		echo >&2 "* Using URL $url"
+	fi
 	echo >&2 "* Queue-ID: $id"
 	echo
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/cca6584b96e6c33d0732d559e43e100d804e2ecd