[packages/rpm-build-tools] do exact bcond match when reporting active bconds

atler atler at pld-linux.org
Mon Nov 16 13:20:13 CET 2020


commit b28896b39717e859665e3823290564c4d0f271b4
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Nov 16 11:54:42 2020 +0100

    do exact bcond match when reporting active bconds
    
    `builder --without static_libs bash` reports <static> bcond is active even
    though it's not

 builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/builder.sh b/builder.sh
index 2daade8..ed2184b 100755
--- a/builder.sh
+++ b/builder.sh
@@ -1824,7 +1824,7 @@ set_bconds_values() {
 		without_*)
 			bcond=${opt#without_}
 			case "$BCOND" in
-			*--without?${bcond}*)
+			*--without?${bcond}\ *|*--without?${bcond})
 				AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$bcond>"
 				;;
 			*)
@@ -1835,7 +1835,7 @@ set_bconds_values() {
 		with_*)
 			bcond=${opt#with_}
 			case "$BCOND" in
-			*--with?${bcond}*)
+			*--with?${bcond}\ *|*--with?${bcond})
 				AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$bcond>"
 				;;
 			*)
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list