bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix downloading multiple urls with XferCommand

Browse source 
An extra break causes _alpm_download to break out of the payload loop as
soon as it sees a successful url download with XferCommand.

Fixes: FS#70608 - -U fails to download all files with XferCommand

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
This commit is contained in:
Andrew Gregory 2021-04-26 19:37:52 -07:00 • committed by Allan McRae
parent 8faf749fd1
commit 0ff94ae85d
3 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/libalpm/dload.c
View file

@ -880,7 +880,6 @@ int _alpm_download(alpm_handle_t *handle,
if(payload->fileurl) { if(payload->fileurl) {
if (handle->fetchcb(handle->fetchcb_ctx, payload->fileurl, localpath, payload->force) != -1) { if (handle->fetchcb(handle->fetchcb_ctx, payload->fileurl, localpath, payload->force) != -1) {
success = 1; success = 1;
break;
} }
} else { } else {
for(s = payload->servers; s; s = s->next) { for(s = payload->servers; s; s = s->next) {

2
test/pacman/meson.build
View file

@ -333,6 +333,7 @@ pacman_tests = [
'tests/upgrade-download-404.py', 'tests/upgrade-download-404.py',
'tests/upgrade-download-pkg-and-sig-with-filename.py', 'tests/upgrade-download-pkg-and-sig-with-filename.py',
'tests/upgrade-download-pkg-and-sig-without-filename.py', 'tests/upgrade-download-pkg-and-sig-without-filename.py',
'tests/upgrade-download-with-xfercommand.py',
] ]
xfail_tests = { xfail_tests = {
@ -344,6 +345,7 @@ xfail_tests = {
'tests/sync403.py': true, 'tests/sync403.py': true,
'tests/sync406.py': true, 'tests/sync406.py': true,
'tests/upgrade078.py': true, 'tests/upgrade078.py': true,
'tests/upgrade-download-with-xfercommand.py': true,
} }
foreach input : pacman_tests foreach input : pacman_tests

26
test/pacman/tests/upgrade-download-with-xfercommand.py Normal file
View file

@ -0,0 +1,26 @@
self.description = "--upgrade remote packages with XferCommand"
self.option['XferCommand'] = ['/usr/bin/curl %u -o %o']
p1 = pmpkg('pkg1', '1.0-1')
self.addpkg(p1)
p2 = pmpkg('pkg2', '2.0-2')
self.addpkg(p2)
url = self.add_simple_http_server({
'/{}'.format(p1.filename()): p1.makepkg_bytes(),
'/{}'.format(p2.filename()): p2.makepkg_bytes(),
})
self.args = '-U {url}/{} {url}/{}'.format(p1.filename(), p2.filename(), url=url)
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")
self.addrule("CACHE_EXISTS=pkg1|1.0-1")
self.addrule("CACHE_EXISTS=pkg2|2.0-2")
# --upgrade fails hard with XferCommand because the fetch callback has no way
# to return the file path to alpm
self.expectfailure = True