openstack/ovsdbapp
Code Issues Proposed changes

Fix KEEP_VENV for recent OVN/OVS and single venvs

Browse Source 
The switch to OVS src being found in the OVN directory years ago
never made it into debug_venv. Also fixed is debug_venv handling
single ovsvenv.* directories, where grep would not return the
filename.

Change-Id: I16dfbfeb4af0f550bf85c3c7ab3404b9366e56d1
Signed-off-by: Terry Wilson <twilson@redhat.com>
This commit is contained in:
Terry Wilson
2026-01-15 16:39:24 -06:00
parent b4b4645836
commit 928b714271
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/debug_venv
View File

@@ -50,14 +50,12 @@ fi
if [ -n "$regex" -a -z "$ovsvenv" ]; then
# Just do the first match for now
lookup=$(grep $regex $VIRTUAL_ENV/ovsvenv.*|head -1)
lookup=$(grep -l $regex $VIRTUAL_ENV/ovsvenv.*|head -1)
if [ -z "$lookup" ]; then
echo "Could not match $regex" 1>&2
exit 1
fi
test_file=$(echo $lookup|cut -d: -f1)
test_match=", matched $(echo $lookup|rev|cut -d: -f1|rev)"
ovsvenv=$(head -1 $test_file)
ovsvenv=$(head -1 $lookup)
fi
echo "Debugging OVS virtual environment: $ovsvenv$test_match"
tools/debug_venv.py $ovsvenv $VIRTUAL_ENV/src/ovs $VIRTUAL_ENV/src/ovn
echo "Debugging OVS virtual environment: $ovsvenv, matched $lookup"
tools/debug_venv.py $ovsvenv $VIRTUAL_ENV/src/ovn/ovs $VIRTUAL_ENV/src/ovn