Commit 475f6af6 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbb: restore PKGFORMAT detection for fix --nodeps

parent d6790bb4
...@@ -81,6 +81,12 @@ test -n "$LISTRPMARGS" && echog "Run $RPMBUILD with options: '$LISTRPMARGS'" ...@@ -81,6 +81,12 @@ test -n "$LISTRPMARGS" && echog "Run $RPMBUILD with options: '$LISTRPMARGS'"
try_enable_ccache try_enable_ccache
detect_target_env
assert_var PKGFORMAT
# Set nodeps if run in non rpm system
[ "$PKGFORMAT" = "rpm" ] && NODEPS="" || NODEPS="--nodeps"
# instead cbuild req # instead cbuild req
if [ -n "$BUILDREQ" ] ; then if [ -n "$BUILDREQ" ] ; then
uni_buildreq $BUILDREQ $LISTNAMES uni_buildreq $BUILDREQ $LISTNAMES
...@@ -91,15 +97,12 @@ fi ...@@ -91,15 +97,12 @@ fi
if [ -n "$BUILDOPT" ] ; then if [ -n "$BUILDOPT" ] ; then
is_alt || fatal "Sorry, only ALT Linux rpm supports --short-circuit correctly" is_alt || fatal "Sorry, only ALT Linux rpm supports --short-circuit correctly"
for it in $BUILDOPT for it in $BUILDOPT ; do
do uni_rpmbuild --commit $LISTNAMES -b$it $LISTRPMARGS $NODEPS --target $BUILDARCH --short-circuit
uni_rpmbuild --commit $LISTNAMES -b$it $LISTRPMARGS --target $BUILDARCH --short-circuit
done done
exit 0 exit 0
fi fi
# Set nodeps if run in non rpm system
[ "$PKGFORMAT" = "rpm" ] && NODEPS="" || NODEPS="--nodeps"
for i in $LISTNAMES for i in $LISTNAMES
do do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment