From 18890d5a0351ffe4fc495e0d47e3a86e0a9cb7ad Mon Sep 17 00:00:00 2001
From: Ken Dreyer <kdreyer@redhat.com>
Date: Fri, 5 Jun 2015 17:21:50 -0600
Subject: [PATCH] radosgw-agent: better SUSE detection

We might have mis-understood the use of "hash". "hash zypper" can return
nothing if zypper has never been run. Tested on
itbuilder-cdep-rpm-sles11sp2-amd64-basic.

Just test the presence of /usr/bin/zypper.
---
 radosgw-agent/build/build | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/radosgw-agent/build/build b/radosgw-agent/build/build
index b40e1815..e202c2b6 100644
--- a/radosgw-agent/build/build
+++ b/radosgw-agent/build/build
@@ -22,15 +22,7 @@ echo "  WS=$WORKSPACE"
 echo "  PWD=$(pwd)"
 ls -l
 
-is_suse() {
-    if hash zypper 2>/dev/null; then
-        echo 1
-    else
-        echo 0
-    fi
-}
-
-if [[ -f /etc/redhat-release || is_suse -eq 1 ]] ; then
+if [[ -f /etc/redhat-release || -f /usr/bin/zypper ]] ; then
         rm -rf ./dist  # Remove any previous artifacts
         mkdir -p $WORKSPACE/dist/noarch
         mkdir -p $WORKSPACE/dist/SRPMS
-- 
2.39.5