Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84003835 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Virtualenv: Check return value before popd"

parents 13826c81 87dc86de

system/gd/cert/set_up_virtualenv.sh

+4 −2
Original line number Diff line number Diff line
@@ -149,11 +149,12 @@ fi 
pushd .

cd $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd

virtualenv -p python3.8 gd_cert_venv

popd

if [[ $? -ne 0 ]] ; then

    echo "Error setting up virtualenv"

    popd

    return 1

fi

popd



# Set up artifacts

pushd .
@@ -184,12 +185,13 @@ popd 
# Activate virtualenv

pushd .

source $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/gd_cert_venv/bin/activate

popd

if [[ $? -ne 0 ]] ; then

    echo "Failed to activate virtualenv"

    deactivate

    popd

    return 1

fi

popd

if [[ -z "$ANDROID_BUILD_TOP" ]] ; then

    echo "Failed to inherit Android build environment"

    deactivate