From 06e8a5476b7a4e98506dcee7ca7a9680d80f91e6 Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Sat, 10 Jul 2021 01:50:01 +0530 Subject: [PATCH] build_utils: check if PROFILE for pbuilder exists since not sure if --profile accepts comma or not, added this check Signed-off-by: Deepika Upadhyay --- scripts/build_utils.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 173bd9bf..4c0e1a42 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -840,7 +840,7 @@ gen_debian_version() { # Flavor Builds support # - CEPH_EXTRA_RPMBUILD_ARGS is consumed by build_rpms() # - CEPH_EXTRA_CMAKE_ARGS is consumed by debian/rules and ceph.spec directly -# - PROFILES is consumed by pbuilder +# - PROFILES is consumed by build_debs() ceph_build_args_from_flavor() { local flavor=$1 shift @@ -914,7 +914,12 @@ build_debs() { CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS $(extra_cmake_args)" DEB_BUILD_OPTIONS="parallel=$(get_nr_build_jobs)" - PROFILES="nocheck,$PROFILES" + + if [ -z "$PROFILES" ]; then + PROFILES="nocheck,$PROFILES" + else + PROFILES="nocheck" + fi # pass only those env vars specifically noted sudo \ -- 2.39.5