Fix stretch apt archive (#737)

mlocati · Apr 27, 2023 · 7655337 · 7655337
1 parent 5d18994
commit 7655337
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/test-extensions.yml b/.github/workflows/test-extensions.yml
@@ -98,7 +98,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - run: docker run --rm --volume "$(pwd):/app" --workdir /app php:7.3-stretch ./scripts/test-restore-apt
+      - run: docker run --rm --volume "$(pwd):/app" --workdir /app php:8.2-bullseye ./scripts/test-restore-apt
   test_custom_version:
     name: Test installing specific versions
     needs:

diff --git a/install-php-extensions b/install-php-extensions
@@ -3925,7 +3925,12 @@ invokeAptGetUpdate() {
 		return
 	fi
 	IPE_APTGET_INSTALLOPTIONS=''
-	if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then
+	invokeAptGetUpdate_fixdistro=''
+	if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then
+		invokeAptGetUpdate_fixdistro=jessie
+	elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then
+		invokeAptGetUpdate_fixdistro=stretch
+	else
 		IPE_APTGETUPDATE_ALREADY=y
 		DEBIAN_FRONTEND=noninteractive apt-get update -q
 		return
@@ -3937,7 +3942,7 @@ invokeAptGetUpdate() {
 	if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then
 		IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security
 	fi
-	sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+jessie-updates\b.*);#\1;" /etc/apt/sources.list
+	sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list
 	sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list
 	sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list
 	sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list