[packages/rpm-build-tools] $RPMOPTS need to be processed via eval

[glen]

commit 74ede51d921cd5bcea0cb53040c0c8c1bbac33cc
Author: Elan Ruusamäe <g...@delfi.ee>
Date:   Mon Aug 29 14:50:46 2016 +0300

    $RPMOPTS need to be processed via eval

 builder.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/builder.sh b/builder.sh
index 3317102..3e08d71 100755
--- a/builder.sh
+++ b/builder.sh
@@ -1992,12 +1992,12 @@ install_build_requires_rpmdeps() {
        local DEPS CNFL
        if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
                # TODO: Conflicts list doesn't check versions
-               CNFL=$(rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk 
'/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
-               DEPS=$(rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk 
'/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
+               CNFL=$(eval rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null 
| awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
+               DEPS=$(eval rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null 
| awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
        fi
        if [ "$FETCH_BUILD_REQUIRES_RPMSPECSRPM" = "yes" ]; then
-               CNFL=$(rpm -q --specsrpm --conflicts $BCOND $RPMOPTS $SPECFILE 
| awk '{print $1}' | _rpm_cnfl_check | xargs)
-               DEPS=$(rpm -q --specsrpm --requires $BCOND $RPMOPTS $SPECFILE | 
awk '{print $1}' | _rpm_prov_check | xargs)
+               CNFL=$(eval rpm -q --specsrpm --conflicts $BCOND $RPMOPTS 
$SPECFILE | awk '{print $1}' | _rpm_cnfl_check | xargs)
+               DEPS=$(eval rpm -q --specsrpm --requires $BCOND $RPMOPTS 
$SPECFILE | awk '{print $1}' | _rpm_prov_check | xargs)
        fi
 
        if [ -n "$CNFL" ]; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/74ede51d921cd5bcea0cb53040c0c8c1bbac33cc

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit