setup.bash: fix package exceptions, prevent sourcing of different pro…

…files

profiles/build/common/setup.bash

@@ -6,7 +6,6 @@ WORKSPACE_DIR=${WORKSPACE_DIR:-"$(pwd)"}
 BUILD_PROFILES_DIR=${BUILD_PROFILES_DIR:-"${WORKSPACE_DIR}/profiles/build"}
 export WORKSPACE_DIR BUILD_PROFILES_DIR
 
-
 if [ -z "${BUILD_PROFILE}" ]
 then
     echo "Profile is not defined"
@@ -16,6 +15,18 @@ else
     export BUILD_PROFILE
 fi
 
+if [ -z "${SOURCED_BUILD_PROFILE}" ]
+then
+    SOURCED_BUILD_PROFILE="${BUILD_PROFILE}"
+    export SOURCED_BUILD_PROFILE
+else
+    if [ "${SOURCED_BUILD_PROFILE}" != "${BUILD_PROFILE}" ]
+    then
+        echo "CCWS: cannot source '${BUILD_PROFILE}' profile, '${SOURCED_BUILD_PROFILE}' is already in use."
+        return 0
+    fi
+fi
+
 if [ -z "${CCWS_ARTIFACTS_DIR}" ]
 then
     if [ -z "${ARTIFACTS_DIR}" ]
@@ -341,6 +352,11 @@ ccws_read_exceptions()
 
     if [ -f "${FILE}" ]
     then
-        sed -e 's=^=:${CCWS_SOURCE_DIR}/=' < "${FILE}" | tr -d '\n'
+        if [ "$1" = "paths" ]
+        then
+            sed -e 's=^=:${CCWS_SOURCE_DIR}/=' < "${FILE}" | tr -d '\n'
+        else
+            sed -e 's=^=:=' < "${FILE}" | tr -d '\n'
+        fi
     fi
 }

profiles/build/deb/setup.bash

@@ -11,7 +11,7 @@ BASE_BUILD_PROFILE=${1:-"$BASE_BUILD_PROFILE"}
 if [ -z "${BASE_BUILD_PROFILE}" ]
 then
     echo "Build profile cannot be chosen automatically for 'deb' mixin, make sure BASE_BUILD_PROFILE is set."
-    false
+    return 0
 fi