From ab4a2b6e48f419d6b63a33f19209882902c03dfd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sun, 31 Jul 2005 00:47:03 +0000
Subject: [PATCH] - detect and use rpm-getdeps binary - skip --upa if --up
 succeeded on poldek

Changed files:
    builder.sh -> 1.321
---
 builder.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/builder.sh b/builder.sh
index a40ab50..eac5ba7 100644
--- a/builder.sh
+++ b/builder.sh
@@ -91,6 +91,12 @@ DEF_NICE_LEVEL=19
 
 FAIL_IF_NO_SOURCES="yes"
 
+if [ -x /usr/bin/rpm-getdeps ]; then
+	 FETCH_BUILD_REQUIRES_RPMGETDEPS="yes"
+else
+	 FETCH_BUILD_REQUIRES_RPMGETDEPS="no"
+fi
+
 # Here we load saved user environment used to
 # predefine options set above, or passed to builder
 # in command line.
@@ -1156,7 +1162,7 @@ fetch_build_requires()
 			CONF=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print "@" $3 } ' | xargs)
 			DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print "@" $3 } ' | xargs)
 			if [ -n "$CONF" -o -n "$DEPS" ]; then
-				$SU_SUDO /usr/bin/poldek --update; $SU_SUDO /usr/bin/poldek --upa
+				$SU_SUDO /usr/bin/poldek --update || $SU_SUDO /usr/bin/poldek --upa
 			fi
 			if [ -n "$CONF" ]; then
 				echo "Trying to uninstall conflicting packages ($CONF):"
-- 
2.44.0