Skip to content

Commit 7655337

Browse files
authored
Fix stretch apt archive (#737)
1 parent 5d18994 commit 7655337

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/test-extensions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
steps:
9999
- name: Checkout
100100
uses: actions/checkout@v2
101-
- run: docker run --rm --volume "$(pwd):/app" --workdir /app php:7.3-stretch ./scripts/test-restore-apt
101+
- run: docker run --rm --volume "$(pwd):/app" --workdir /app php:8.2-bullseye ./scripts/test-restore-apt
102102
test_custom_version:
103103
name: Test installing specific versions
104104
needs:

install-php-extensions

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3925,7 +3925,12 @@ invokeAptGetUpdate() {
39253925
return
39263926
fi
39273927
IPE_APTGET_INSTALLOPTIONS=''
3928-
if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then
3928+
invokeAptGetUpdate_fixdistro=''
3929+
if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then
3930+
invokeAptGetUpdate_fixdistro=jessie
3931+
elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then
3932+
invokeAptGetUpdate_fixdistro=stretch
3933+
else
39293934
IPE_APTGETUPDATE_ALREADY=y
39303935
DEBIAN_FRONTEND=noninteractive apt-get update -q
39313936
return
@@ -3937,7 +3942,7 @@ invokeAptGetUpdate() {
39373942
if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then
39383943
IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security
39393944
fi
3940-
sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+jessie-updates\b.*);#\1;" /etc/apt/sources.list
3945+
sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list
39413946
sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list
39423947
sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list
39433948
sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list

0 commit comments

Comments
 (0)