Author: glen Date: Sun Jul 31 00:47:08 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- detect and use rpm-getdeps binary
- skip --upa if --up succeeded on poldek
---- Files affected:
SPECS:
builder (1.320 -> 1.321)
---- Diffs:
================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.320 SPECS/builder:1.321
--- SPECS/builder:1.320 Tue Jul 26 20:04:55 2005
+++ SPECS/builder Sun Jul 31 02:47:03 2005
@@ -91,6 +91,12 @@
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 @@
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):"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/builder?r1=1.320&r2=1.321&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
