vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-06 22:18:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix: Replace security.debian.org with archive

Browse Source
This commit is contained in:
Mauro Regli
2023-05-10 15:24:00 +02:00
committed by Mauro
parent c9b1782d62
commit 95ca6fb376
13 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/t04_mirror/CreateMirror19Test_gold
+3 -3
View File
@@ -1,9 +1,9 @@
Downloading http://security.debian.org/dists/stretch/updates/InRelease... Downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease...
Success downloading http://security.debian.org/dists/stretch/updates/InRelease Success downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease
gpgv: RSA key ID 331F7F50 gpgv: RSA key ID 331F7F50
gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>"
gpgv: RSA key ID E562B32A gpgv: RSA key ID E562B32A
gpgv: Good signature from "Debian Security Archive Automatic Signing Key (10/buster) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Security Archive Automatic Signing Key (10/buster) <ftpmaster@debian.org>"
Mirror [mirror19]: http://security.debian.org/ stretch/updates [src] successfully added. Mirror [mirror19]: http://archive.debian.org/debian-security/ stretch/updates [src] successfully added.
You can run 'aptly mirror update mirror19' to download repository contents. You can run 'aptly mirror update mirror19' to download repository contents.
system/t04_mirror/CreateMirror19Test_mirror_show
+1 -1
View File
@@ -1,5 +1,5 @@
Name: mirror19 Name: mirror19
Archive Root URL: http://security.debian.org/ Archive Root URL: http://archive.debian.org/debian-security/
Distribution: stretch/updates Distribution: stretch/updates
Components: main Components: main
Architectures: i386 Architectures: i386
system/t04_mirror/CreateMirror20Test_gold
+9 -9
View File
@@ -1,9 +1,9 @@
Downloading http://security.debian.org/dists/stretch/updates/InRelease... Downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease...
Error downloading http://security.debian.org/dists/stretch/updates/InRelease: http://security.debian.org/dists/stretch/updates/InRelease: Get "http://security.debian.org/dists/stretch/updates/InRelease": http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused retrying... Error downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease: http://archive.debian.org/debian-security/dists/stretch/updates/InRelease: Get "http://archive.debian.org/debian-security/dists/stretch/updates/InRelease": http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused retrying...
Retrying 0 http://security.debian.org/dists/stretch/updates/InRelease... Retrying 0 http://archive.debian.org/debian-security/dists/stretch/updates/InRelease...
Giving up on http://security.debian.org/dists/stretch/updates/InRelease... Giving up on http://archive.debian.org/debian-security/dists/stretch/updates/InRelease...
Downloading http://security.debian.org/dists/stretch/updates/Release... Downloading http://archive.debian.org/debian-security/dists/stretch/updates/Release...
Error downloading http://security.debian.org/dists/stretch/updates/Release: http://security.debian.org/dists/stretch/updates/Release: Get "http://security.debian.org/dists/stretch/updates/Release": http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused retrying... Error downloading http://archive.debian.org/debian-security/dists/stretch/updates/Release: http://archive.debian.org/debian-security/dists/stretch/updates/Release: Get "http://archive.debian.org/debian-security/dists/stretch/updates/Release": http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused retrying...
Retrying 0 http://security.debian.org/dists/stretch/updates/Release... Retrying 0 http://archive.debian.org/debian-security/dists/stretch/updates/Release...
Giving up on http://security.debian.org/dists/stretch/updates/Release... Giving up on http://archive.debian.org/debian-security/dists/stretch/updates/Release...
ERROR: unable to fetch mirror: http://security.debian.org/dists/stretch/updates/Release: Get http://security.debian.org/dists/stretch/updates/Release: http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused ERROR: unable to fetch mirror: http://archive.debian.org/debian-security/dists/stretch/updates/Release: Get http://archive.debian.org/debian-security/dists/stretch/updates/Release: http: error connecting to proxy http://127.0.0.1:3137: dial tcp 127.0.0.1:3137: connection refused
system/t04_mirror/CreateMirror22Test_gold
+3 -3
View File
@@ -1,5 +1,5 @@
Downloading http://security.debian.org/dists/stretch/updates/Release... Downloading http://archive.debian.org/debian-security/dists/stretch/updates/Release...
Success downloading http://security.debian.org/dists/stretch/updates/Release Success downloading http://archive.debian.org/debian-security/dists/stretch/updates/Release
Mirror [mirror22]: http://security.debian.org/ stretch/updates successfully added. Mirror [mirror22]: http://archive.debian.org/debian-security/ stretch/updates successfully added.
You can run 'aptly mirror update mirror22' to download repository contents. You can run 'aptly mirror update mirror22' to download repository contents.
system/t04_mirror/CreateMirror22Test_mirror_show
+1 -1
View File
@@ -1,5 +1,5 @@
Name: mirror22 Name: mirror22
Archive Root URL: http://security.debian.org/ Archive Root URL: http://archive.debian.org/debian-security/
Distribution: stretch/updates Distribution: stretch/updates
Components: main Components: main
Architectures: amd64, arm64, armel, armhf, i386 Architectures: amd64, arm64, armel, armhf, i386
system/t04_mirror/CreateMirror24Test_gold
+3 -3
View File
@@ -1,9 +1,9 @@
Downloading http://security.debian.org/dists/stretch/updates/InRelease... Downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease...
Success downloading http://security.debian.org/dists/stretch/updates/InRelease Success downloading http://archive.debian.org/debian-security/dists/stretch/updates/InRelease
gpgv: RSA key ID 331F7F50 gpgv: RSA key ID 331F7F50
gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Security Archive Automatic Signing Key (9/stretch) <ftpmaster@debian.org>"
gpgv: RSA key ID E562B32A gpgv: RSA key ID E562B32A
gpgv: Good signature from "Debian Security Archive Automatic Signing Key (10/buster) <ftpmaster@debian.org>" gpgv: Good signature from "Debian Security Archive Automatic Signing Key (10/buster) <ftpmaster@debian.org>"
Mirror [mirror24]: http://security.debian.org/ stretch/updates successfully added. Mirror [mirror24]: http://archive.debian.org/debian-security/ stretch/updates successfully added.
You can run 'aptly mirror update mirror24' to download repository contents. You can run 'aptly mirror update mirror24' to download repository contents.
system/t04_mirror/EditMirror5Test_gold
+1 -1
View File
@@ -1 +1 @@
Mirror [mirror5]: http://security.debian.org/ stretch/updates successfully updated. Mirror [mirror5]: http://archive.debian.org/debian-security/ stretch/updates successfully updated.
system/t04_mirror/EditMirror5Test_mirror_show
+1 -1
View File
@@ -1,5 +1,5 @@
Name: mirror5 Name: mirror5
Archive Root URL: http://security.debian.org/ Archive Root URL: http://archive.debian.org/debian-security/
Distribution: stretch/updates Distribution: stretch/updates
Components: main Components: main
Architectures: amd64, arm64, armel, armhf, i386 Architectures: amd64, arm64, armel, armhf, i386
system/t04_mirror/ShowMirror4Test_gold
+1 -1
View File
@@ -1,5 +1,5 @@
Name: mirror4 Name: mirror4
Archive Root URL: http://security.debian.org/ Archive Root URL: http://archive.debian.org/debian-security/
Distribution: stretch/updates Distribution: stretch/updates
Components: main Components: main
Architectures: amd64, arm64, armel, armhf, i386 Architectures: amd64, arm64, armel, armhf, i386
system/t04_mirror/ShowMirror8Test_gold
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"UUID": "548dbdb6-75d6-42ac-80de-d6aff8012f83", "UUID": "548dbdb6-75d6-42ac-80de-d6aff8012f83",
"Name": "mirror4", "Name": "mirror4",
"ArchiveRoot": "http://security.debian.org/", "ArchiveRoot": "http://archive.debian.org/debian-security/",
"Distribution": "stretch/updates", "Distribution": "stretch/updates",
"Components": [ "Components": [
"main" "main"
system/t04_mirror/create.py
+7 -7
View File
@@ -237,7 +237,7 @@ class CreateMirror19Test(BaseTest):
""" """
fixtureGpg = True fixtureGpg = True
runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror19 http://security.debian.org/ stretch/updates main" runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror19 http://archive.debian.org/debian-security/ stretch/updates main"
def outputMatchPrepare(self, s): def outputMatchPrepare(self, s):
return re.sub(r'Signature made .* using', '', s) return re.sub(r'Signature made .* using', '', s)
@@ -258,7 +258,7 @@ class CreateMirror20Test(BaseTest):
fixtureGpg = True fixtureGpg = True
configOverride = {"max-tries": 1} configOverride = {"max-tries": 1}
runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror20 http://security.debian.org/ stretch/updates main" runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror20 http://archive.debian.org/debian-security/ stretch/updates main"
environmentOverride = {"HTTP_PROXY": "127.0.0.1:3137"} environmentOverride = {"HTTP_PROXY": "127.0.0.1:3137"}
expectedCode = 1 expectedCode = 1
@@ -270,8 +270,8 @@ class CreateMirror20Test(BaseTest):
).replace( ).replace(
'proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137' 'proxyconnect tcp', 'http: error connecting to proxy http://127.0.0.1:3137'
).replace( ).replace(
'Get http://security.debian.org/dists/stretch/updates/Release:', 'Get http://archive.debian.org/debian-security/dists/stretch/updates/Release:',
'Get "http://security.debian.org/dists/stretch/updates/Release":' 'Get "http://archive.debian.org/debian-security/dists/stretch/updates/Release":'
) )
@@ -302,7 +302,7 @@ class CreateMirror22Test(BaseTest):
""" """
create mirror: mirror with filter create mirror: mirror with filter
""" """
runCmd = "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' mirror22 http://security.debian.org/ stretch/updates main" runCmd = "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' mirror22 http://archive.debian.org/debian-security/ stretch/updates main"
def check(self): def check(self):
def removeDates(s): def removeDates(s):
@@ -317,7 +317,7 @@ class CreateMirror23Test(BaseTest):
""" """
create mirror: mirror with wrong filter create mirror: mirror with wrong filter
""" """
runCmd = "aptly mirror create -ignore-signatures -filter='nginx | ' mirror23 http://security.debian.org/ stretch/updates main" runCmd = "aptly mirror create -ignore-signatures -filter='nginx | ' mirror23 http://archive.debian.org/debian-security/ stretch/updates main"
expectedCode = 1 expectedCode = 1
@@ -325,7 +325,7 @@ class CreateMirror24Test(BaseTest):
""" """
create mirror: disable config value with option create mirror: disable config value with option
""" """
runCmd = "aptly mirror create -ignore-signatures=false -keyring=aptlytest.gpg mirror24 http://security.debian.org/ stretch/updates main" runCmd = "aptly mirror create -ignore-signatures=false -keyring=aptlytest.gpg mirror24 http://archive.debian.org/debian-security/ stretch/updates main"
fixtureGpg = True fixtureGpg = True
def outputMatchPrepare(self, s): def outputMatchPrepare(self, s):
system/t04_mirror/edit.py
+1 -1
View File
@@ -49,7 +49,7 @@ class EditMirror5Test(BaseTest):
edit mirror: remove filter edit mirror: remove filter
""" """
fixtureCmds = [ fixtureCmds = [
"aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' mirror5 http://security.debian.org/ stretch/updates main", "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' mirror5 http://archive.debian.org/debian-security/ stretch/updates main",
] ]
runCmd = "aptly mirror edit -filter= mirror5" runCmd = "aptly mirror edit -filter= mirror5"
system/t04_mirror/show.py
+2 -2
View File
@@ -35,7 +35,7 @@ class ShowMirror4Test(BaseTest):
show mirror: mirror with filter show mirror: mirror with filter
""" """
fixtureCmds = [ fixtureCmds = [
"aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://security.debian.org/ stretch/updates main" "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://archive.debian.org/debian-security/ stretch/updates main"
] ]
runCmd = "aptly mirror show mirror4" runCmd = "aptly mirror show mirror4"
@@ -75,7 +75,7 @@ class ShowMirror8Test(BaseTest):
show mirror: mirror with filter show mirror: mirror with filter
""" """
fixtureCmds = [ fixtureCmds = [
"aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://security.debian.org/ stretch/updates main" "aptly mirror create -ignore-signatures -filter='nginx | Priority (required)' -filter-with-deps=true mirror4 http://archive.debian.org/debian-security/ stretch/updates main"
] ]
runCmd = "aptly mirror show -json mirror4" runCmd = "aptly mirror show -json mirror4"