From 4198da9d8f2298742f22455d23799eec2dcb4fbb Mon Sep 17 00:00:00 2001
From: brian <brian>
Date: Fri, 24 Apr 2009 20:12:13 +0000
Subject: [PATCH] b=16312

Remedial cleanup of an lbuild feature that changed while this patch was
waiting to land.
---
 build/lbuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/lbuild b/build/lbuild
index 93d62a5..3e4e0cd 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -369,7 +369,6 @@ download_srpm() {
     local target=$1
     local srpm=$2
 
-    # ~sigh~  the download site doesn't actually have these kernels
     echo "Downloading http://downloads.lustre.org/public/kernels/$target/old/$srpm..."
     if ! wget -nv "http://downloads.lustre.org/public/kernels/$target/old/$srpm" \
         -O "$KERNELDIR/$srpm"; then
@@ -659,8 +658,11 @@ build_lustre() {
         echo NORPM mode. Only compiling.
     fi
 
+    if $PATCHLESS; then
+        rpmbuildopt="$rpmbuildopt --define \"lustre_name lustre-client\""
+    fi
+
     $RPMBUILD $targets $rpmbuildopt ../lustre.spec \
-        ${PATCHLESS:+--define "lustre_name lustre-client"} \
         --define "_tmppath $TMPDIR" \
         --define "_topdir $TOPDIR" || \
         fatal 1 "Error building rpms for $BUILD_ARCHS."
-- 
1.8.3.1