From: brian <brian>
Date: Thu, 11 Jun 2009 12:36:50 +0000 (+0000)
Subject: b=19762
X-Git-Tag: v1_9_220~154
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e5d626bc315e76e4f6d66d57cabfaeb948bce856;hp=76692373bcaa0650e97597b6fc5a5e762dd4661f

b=19762
i=jack
i=yangsheng

Because build_kernel_with_srpm()'s caller expects it to echo a return value,
we need to make sure nothing else is on build_kernel_with_srpm()'s stdout.
---

diff --git a/build/lbuild b/build/lbuild
index 7e14e90..f285ea6 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -1130,7 +1130,7 @@ build_kernel_with_srpm() {
     else
         # nothing cached, build from scratch
         if [ ! -r "$KERNELDIR/$KERNEL_SRPM" ]; then
-            download_srpm "$CANONICAL_TARGET" "$KERNEL_SRPM"
+            download_srpm "$CANONICAL_TARGET" "$KERNEL_SRPM" >&2
         fi
 
         rpm -ivh $KERNELDIR/$KERNEL_SRPM --define "_topdir $TOPDIR" >&2 || {
@@ -1141,7 +1141,7 @@ build_kernel_with_srpm() {
 
         # put the Lustre kernel patch into the RPM build tree
         cp $FULL_PATCH $TOPDIR/SOURCES/linux-${lnxmaj}-lustre.patch
-        prepare_and_build_srpm
+        prepare_and_build_srpm >&2
 
         # store the resulting kernel RPM build tree for future use
         if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \