Skip to content

Commit f1198c9

Browse files
authored
Merge branch 'master' into sync_to_piper
2 parents a439078 + 13682bc commit f1198c9

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ it accepted.
8181

8282
All files in this repository are under the
8383
[Apache License, Version 2.0](LICENSE) unless noted otherwise.
84-
<---Testing the import PR with the CC team. This PR is for testing purposes only.--->
84+
<---Testing the import PR with the CC team. This PR is for testing purposes only.--->

daisy_workflows/image_build/debian/debian_worker.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@ if [[ $? -ne 0 ]]; then
6060
exit 1
6161
fi
6262

63+
# On Debian 13, the python3-requests package prevents the later pip
64+
# install from succeeding due to it being a system-installed package.
65+
# The newer verison of pip seems to error instead of skip pre-installed
66+
# system packages, so this is merely a workaround to let things work.
67+
if [[ ${DEBIAN_VERSION} -eq 13 ]]; then
68+
echo "BuildStatus: Removing python3-requests from Debian 13"
69+
apt -y remove python3-requests
70+
fi
71+
6372
echo "BuildStatus: Installing python3 libraries from pip."
6473
if [[ ${DEBIAN_VERSION} -ge 12 ]]; then
6574
pip3 install --break-system-packages -U ${PIP3_PACKAGES}

0 commit comments

Comments
 (0)