- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] libalpm: take alpm_trans_t out of the public API
by morganamilo 03 Jun '21

03 Jun '21

this type is only used internally by alpm --- lib/libalpm/alpm.h | 6 ------ lib/libalpm/handle.h | 1 + lib/libalpm/trans.h | 4 ++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 101d686b..1413263b 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -113,12 +113,6 @@ typedef struct __alpm_db_t alpm_db_t; */ typedef struct __alpm_pkg_t alpm_pkg_t; -/** Transaction structure used internally by libalpm - * @ingroup libalpm_trans - * */ -typedef struct __alpm_trans_t alpm_trans_t; - - /** The time type used by libalpm. Represents a unix time stamp * @ingroup libalpm_misc */ typedef int64_t alpm_time_t; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index b1526c67..f2602057 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -26,6 +26,7 @@ #include "alpm_list.h" #include "alpm.h" +#include "trans.h" #ifdef HAVE_LIBCURL #include <curl/curl.h> diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index 9e7fcbd7..d2ec0223 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -36,7 +36,7 @@ typedef enum _alpm_transstate_t { } alpm_transstate_t; /* Transaction */ -struct __alpm_trans_t { +typedef struct _alpm_trans_t { /* bitfield of alpm_transflag_t flags */ int flags; alpm_transstate_t state; @@ -44,7 +44,7 @@ struct __alpm_trans_t { alpm_list_t *add; /* list of (alpm_pkg_t *) */ alpm_list_t *remove; /* list of (alpm_pkg_t *) */ alpm_list_t *skip_remove; /* list of (char *) */ -}; +} alpm_trans_t; void _alpm_trans_free(alpm_trans_t *trans); /* flags is a bitfield of alpm_transflag_t flags */ -- 2.31.1

2 4

[pacman-dev] [PATCH v2] docs: Update submission to lists.archlinux.org
by Morten Linderud 03 Jun '21

03 Jun '21

From: Morten Linderud <morten(a)linderud.pw> Currently some overly aggressive spam filter is going to complain if there is a mismatch between the To and Reply-To header. Since Arch Linux has changed the mailing list domains this changes the documentation to reflect the change. https://archlinux.org/news/arch-linux-mailing-list-id-changes/ Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- doc/index.asciidoc | 4 ++-- doc/translation-help.asciidoc | 4 ++-- lib/libalpm/po/meson.build | 2 +- scripts/po/meson.build | 2 +- src/pacman/po/meson.build | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/index.asciidoc b/doc/index.asciidoc index 87f07dda..7200bc18 100644 --- a/doc/index.asciidoc +++ b/doc/index.asciidoc @@ -252,7 +252,7 @@ Utilities available: Bugs ---- If you find bugs (which is quite likely), please email them to the pacman-dev -mailing last at mailto:pacman-dev@archlinux.org[] with specific information +mailing last at mailto:pacman-dev@lists.archlinux.org[] with specific information such as your command-line, the nature of the bug, and even the package database if it helps. @@ -263,6 +263,6 @@ bugs under the Pacman project. Copyright --------- pacman is Copyright (C) 2006-2021 Pacman Development Team -<pacman-dev(a)archlinux.org> and Copyright (C) 2002-2006 Judd Vinet +<pacman-dev(a)lists.archlinux.org> and Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org> and is licensed through the GNU General Public License, version 2 or later. diff --git a/doc/translation-help.asciidoc b/doc/translation-help.asciidoc index 5a67a2d6..fe020e92 100644 --- a/doc/translation-help.asciidoc +++ b/doc/translation-help.asciidoc @@ -55,7 +55,7 @@ Pre-release Updates ~~~~~~~~~~~~~~~~~~~ A week or two before each release, the codebase will go into a string freeze -and an email will be sent to the mailto:pacman-dev@archlinux.org[pacman-dev] +and an email will be sent to the mailto:pacman-dev@lists.archlinux.org[pacman-dev] mailing list asking for translations. This email will have a prefix of *[translation]* for anyone looking to set up an email filter. @@ -150,4 +150,4 @@ There are currently no efforts underway to include translated manual pages in the pacman codebase. However, this is not to say translations are unwelcome. If someone has experience with i18n man pages and how to best include them with our source, please contact the pacman-dev mailing list at -mailto:pacman-dev@archlinux.org[]. +mailto:pacman-dev@lists.archlinux.org[]. diff --git a/lib/libalpm/po/meson.build b/lib/libalpm/po/meson.build index cec28a15..61db9ed9 100644 --- a/lib/libalpm/po/meson.build +++ b/lib/libalpm/po/meson.build @@ -3,7 +3,7 @@ i18n.gettext( args : [ '--directory=@0@'.format(meson.current_source_dir()), '--msgid-bugs-address=http://bugs.archlinux.org/index.php?project=3', - '--copyright-holder="Pacman Development Team <pacman-dev(a)archlinux.org>"', + '--copyright-holder="Pacman Development Team <pacman-dev(a)lists.archlinux.org>"', '--language', 'c', '--keyword=_', diff --git a/scripts/po/meson.build b/scripts/po/meson.build index d8b8c51c..874b51dc 100644 --- a/scripts/po/meson.build +++ b/scripts/po/meson.build @@ -3,7 +3,7 @@ i18n.gettext( args : [ '--directory=@0@'.format(meson.current_source_dir()), '--msgid-bugs-address=http://bugs.archlinux.org/index.php?project=3', - '--copyright-holder="Pacman Development Team <pacman-dev(a)archlinux.org>"', + '--copyright-holder="Pacman Development Team <pacman-dev(a)lists.archlinux.org>"', '--language', 'shell', '--keyword=_', diff --git a/src/pacman/po/meson.build b/src/pacman/po/meson.build index eb45fa1c..78c0230f 100644 --- a/src/pacman/po/meson.build +++ b/src/pacman/po/meson.build @@ -3,7 +3,7 @@ i18n.gettext( args : [ '--directory=@0@'.format(meson.current_source_dir()), '--msgid-bugs-address=http://bugs.archlinux.org/index.php?project=3', - '--copyright-holder="Pacman Development Team <pacman-dev(a)archlinux.org>"', + '--copyright-holder="Pacman Development Team <pacman-dev(a)lists.archlinux.org>"', '--language', 'c', '--keyword=_', -- 2.31.1

3 2

[pacman-dev] [PATCH] repo-add: add --include-sigs option
by Allan McRae 03 Jun '21

03 Jun '21

Pacman now downloads the signature files for all packages when present in a repository. That makes distributing signatures within repository databases redundant and costly. Do not distribute the package signature files within the repo databases by default and add an --include-sigs to revert to the old behaviour. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Resubmit of this patch now we are post 6.0. pacman-6.1 is likely far enough away that there will be plenty of transition time. doc/repo-add.8.asciidoc | 2 ++ scripts/repo-add.sh.in | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/repo-add.8.asciidoc b/doc/repo-add.8.asciidoc index 8de4485b..9b903ab1 100644 --- a/doc/repo-add.8.asciidoc +++ b/doc/repo-add.8.asciidoc @@ -70,6 +70,8 @@ repo-add Options Remove old package files from the disk when updating their entry in the database. +*\--include-sigs*:: + Include package PGP signatures in the repository database (if available) Example ------- diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index d3938396..ac501b1a 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -42,6 +42,7 @@ LOCKFILE= CLEAN_LOCK=0 USE_COLOR='y' PREVENT_DOWNGRADE=0 +INCLUDE_SIGS=0 # Import libmakepkg source "$LIBRARY"/util/compress.sh @@ -260,7 +261,7 @@ db_write_entry() { fi # compute base64'd PGP signature - if [[ -f "$pkgfile.sig" ]]; then + if (( INCLUDE_SIGS )) && [[ -f "$pkgfile.sig" ]]; then if grep -q 'BEGIN PGP SIGNATURE' "$pkgfile.sig"; then error "$(gettext "Cannot use armored signatures for packages: %s")" "$pkgfile.sig" return 1 @@ -622,6 +623,9 @@ while (( $# )); do -p|--prevent-downgrade) PREVENT_DOWNGRADE=1 ;; + --include-sigs) + INCLUDE_SIGS=1 + ;; *) args+=("$1") ;; -- 2.31.1

1 0

[pacman-dev] [PATCH] libalpm: add alpm_dbs_get_pkg
by morganamilo 03 Jun '21

03 Jun '21

This is a common function that pretty much every front end ends up implementing, searching for a package in the syncdbs. May as well add it here for every one to use. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index a5f4a6ae..5fa34faa 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1381,6 +1381,17 @@ int alpm_db_update(alpm_handle_t *handle, alpm_list_t *dbs, int force); */ alpm_pkg_t *alpm_db_get_pkg(alpm_db_t *db, const char *name); +/** Get a package entry from a list of databases. + * This is similar to \link alpm_dbs_get_pkg() get pkg \endlink except it will + * look through a list of databases instead of just one. The first matching + * package found will be returned. + * @param handle the context handle + * @param dbs list of databases to search through + * @param name name of the package + * @return the package entry on success, NULL on error + */ +alpm_pkg_t *alpm_dbs_get_pkg(alpm_handle_t *handle, alpm_list_t *dbs, const char *name); + /** Get the package cache of a package database. * This is a list of all packages the db contains. * @param db pointer to the package database to get the package from diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index b8d1b157..c3cfb13a 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -257,6 +257,16 @@ alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(alpm_db_t *db) return _alpm_db_get_pkgcache(db); } +alpm_pkg_t SYMEXPORT *alpm_dbs_get_pkg(alpm_handle_t *handle, alpm_list_t *dbs, const char *name) +{ + CHECK_HANDLE(handle, return NULL); + ASSERT(name != NULL && strlen(name) != 0, + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL)); + alpm_pkg_t *pkg = _alpm_dbs_get_pkgfromcache(dbs, name); + ASSERT(pkg, RET_ERR(handle, ALPM_ERR_PKG_NOT_FOUND, NULL)); + return pkg; +} + alpm_group_t SYMEXPORT *alpm_db_get_group(alpm_db_t *db, const char *name) { ASSERT(db != NULL, return NULL); @@ -363,6 +373,16 @@ const char *_alpm_db_path(alpm_db_t *db) return db->_path; } +alpm_pkg_t *_alpm_dbs_get_pkgfromcache(alpm_list_t *dbs, const char *name) +{ + alpm_pkg_t *pkg = NULL; + for(alpm_list_t *i = dbs; !pkg && i; i = i->next) { + alpm_db_t *db = i->data; + pkg = _alpm_db_get_pkgfromcache(db, name); + } + return pkg; +} + int _alpm_db_cmp(const void *d1, const void *d2) { const alpm_db_t *db1 = d1; diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 92c69ba7..dfb3212c 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -108,6 +108,7 @@ int _alpm_db_remove_pkgfromcache(alpm_db_t *db, alpm_pkg_t *pkg); alpm_pkghash_t *_alpm_db_get_pkgcache_hash(alpm_db_t *db); alpm_list_t *_alpm_db_get_pkgcache(alpm_db_t *db); alpm_pkg_t *_alpm_db_get_pkgfromcache(alpm_db_t *db, const char *target); +alpm_pkg_t *_alpm_dbs_get_pkgfromcache(alpm_list_t *dbs, const char *name); /* groups */ alpm_list_t *_alpm_db_get_groupcache(alpm_db_t *db); alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7ef558c4..d934de73 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -55,16 +55,9 @@ struct keyinfo_t { alpm_pkg_t SYMEXPORT *alpm_sync_get_new_version(alpm_pkg_t *pkg, alpm_list_t *dbs_sync) { - alpm_list_t *i; - alpm_pkg_t *spkg = NULL; - ASSERT(pkg != NULL, return NULL); pkg->handle->pm_errno = ALPM_ERR_OK; - - for(i = dbs_sync; !spkg && i; i = i->next) { - alpm_db_t *db = i->data; - spkg = _alpm_db_get_pkgfromcache(db, pkg->name); - } + alpm_pkg_t *spkg = _alpm_dbs_get_pkgfromcache(dbs_sync, pkg->name); if(spkg == NULL) { _alpm_log(pkg->handle, ALPM_LOG_DEBUG, "'%s' not found in sync db => no upgrade\n", diff --git a/src/pacman/query.c b/src/pacman/query.c index e3e7d844..2fc2afd1 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -247,15 +247,9 @@ static int query_search(alpm_list_t *targets) static unsigned short pkg_get_locality(alpm_pkg_t *pkg) { const char *pkgname = alpm_pkg_get_name(pkg); - alpm_list_t *j; alpm_list_t *sync_dbs = alpm_get_syncdbs(config->handle); - - for(j = sync_dbs; j; j = alpm_list_next(j)) { - if(alpm_db_get_pkg(j->data, pkgname)) { - return PKG_LOCALITY_NATIVE; - } - } - return PKG_LOCALITY_FOREIGN; + alpm_pkg_t *repo_pkg = alpm_dbs_get_pkg(config->handle, sync_dbs, pkgname); + return repo_pkg ? PKG_LOCALITY_NATIVE : PKG_LOCALITY_FOREIGN; } static int is_unrequired(alpm_pkg_t *pkg, unsigned short level) -- 2.31.1

1 0

[pacman-dev] "pacman --arch=i686 -Syu" results in "error: GPGME error: No data"
by stratus＠tuta.io 03 Jun '21

03 Jun '21

# pacman --arch=i686 -Syu This is clearly not a sensible command, but trying it just to see what happened when using the --arch option out resulted in database corruption, then it was impossible to upgrade and pacman would not function: error: GPGME error: No data error: failed to synchronize all databases (unexpected error) until I did: # rm /var/lib/pacman/sync/* # pacman-key --init # pacman-key --populate archlinux artix # pacman -Syy I tried it again and it did the same thing, and thought you might be interested.

3 2

[pacman-dev] [PATCH 0/1] libalpm: fix resuming after HTTP error
by Hung-I Wang 02 Jun '21

02 Jun '21

Hi, there. When downloading packages, the libalpm may save a body of a unsuccessful HTTP response (e.g. 404). The saved part will then be treated as a partially download package, from where the download will be resumed, resulting in a corrupted package. Steps to reproduce: 1. Prepend a invalid mirror to mirrorlist, say http://example.com/$repo/os/$arch 2. Pick any package, say inkscape 3. (Re-)Install the chosen package with `pacman -S` 4. Pacman gets a HTTP 404 error when trying the newly added "mirror", saving its body as the partially downloaded package 5. Pacman retries the subsequent real mirrors, resuming its download 6. At last, pacman complains with "File ... corrupted (invalid or corrupted package (PGP signature))" This patch fixs the problem by letting curl fails on HTTP error, preventing it from accepting such an invalid HTTP body. Regards, Hung-I Wang --- Hung-I Wang (1): libalpm: fix resuming after HTTP error lib/libalpm/dload.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.31.1

3 4

[pacman-dev] [PATCH] libalpm: prevent download error pages ending up in package files
by Allan McRae 02 Jun '21

02 Jun '21

Some servers respond with error pages (e.g. 404.html) when a package is not present. These were getting written to packages before moving onto the next server. Reset the download progress on 400+ error conditions to avoid this. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is a replacement for Morgan's patch: libalpm: fix 404 pages ending up inside package downloads This approach is less heavy handed, allowing previously partially downloaded packages to be continued. I'm still not sure if there is total download amount tracking issue, but error downloads should be small... lib/libalpm/dload.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 2d8b4d6d..3eea998b 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -510,6 +510,16 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, payload->remote_name, hostname, payload->error_buffer); server_soft_error(handle, payload->fileurl); } + + fflush(payload->localf); + if(fstat(fileno(payload->localf), &st) == 0 && st.st_size != payload->initial_size) { + /* an html error page was written to the file, reset it */ + if(ftruncate(fileno(payload->localf), payload->initial_size)) { + RET_ERR(handle, ALPM_ERR_SYSTEM, -1); + } + fseek(payload->localf, payload->initial_size, SEEK_SET); + } + if(curl_retry_next_server(curlm, curl, payload) == 0) { (*active_downloads_num)++; return 2; -- 2.31.1

1 0

[pacman-dev] Questions about stderr/stdout behaviour on failures
by Oskar Roesler 02 Jun '21

02 Jun '21

Hello, when file conflicts in packages occur, why does the actual conflict get written to stdout and only an non-informative error message to stderr? Example: Stderr only: warning: dependency cycle detected: warning: libglvnd will be installed before its mesa dependency error: failed to commit transaction (conflicting files) ==> ERROR: 'pacman' failed to install missing dependencies. warning: dependency cycle detected: warning: harfbuzz will be installed before its freetype2 dependency warning: dependency cycle detected: warning: libglvnd will be installed before its mesa dependency error: failed to commit transaction (conflicting files) ==> ERROR: 'pacman' failed to install missing dependencies. Both outputs combined: :: Proceed with installation? [Y/n] checking keyring... checking package integrity... loading package files... checking for file conflicts... error: failed to commit transaction (conflicting files) /opt/ros/melodic/lib/python3.9/site-packages/libgtest.so exists in both 'ros-melodic-moveit-core' and 'ros-melodic-tf' /opt/ros/melodic/lib/python3.9/site-packages/libgtest.so.1.10.0 exists in both 'ros-melodic-moveit-core' and 'ros-melodic-tf' Errors occurred, no packages were upgraded. ==> ERROR: 'pacman' failed to install missing dependencies. ==> Missing dependencies: -> ros-build-tools -> ros-melodic-message-filters -> ros-melodic-moveit-core -> ros-melodic-moveit-msgs As e.g. the dependency cycle errors get fully written to stderr, is this a bug or itended? Imho this one line more is important to stderr, otherwise the whole stderr log helps me as much as the returncode. Regards, Oskar

2 2

[pacman-dev] [PATCH 1/1] RFC: handle soft failure in downloads
by Christian Hesse 02 Jun '21

02 Jun '21

From: Christian Hesse <mail(a)eworm.de> A server can indicate a soft failure by returning 412 (Precondition Failed). Only a warning (instead of error) message is logged and download is retried with next server, without counting server error. This http code can be used by servers that are not expected to be complete, for example when serving a local cache. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/dload.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index f6a4f012..7116cb03 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -515,13 +515,23 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, if(!payload->errors_ok) { handle->pm_errno = ALPM_ERR_RETRIEVE; - /* non-translated message is same as libcurl */ - snprintf(payload->error_buffer, sizeof(payload->error_buffer), + if(payload->respcode == 412) { + /* A server can indicate a soft failure by returning 412 + (Precondition Failed). Only a debug message is logged and + download is retried with next server, without counting + server error. */ + _alpm_log(handle, ALPM_LOG_WARNING, + _("file '%s' is currently not available from %s\n"), + payload->remote_name, hostname); + } else { + /* non-translated message is same as libcurl */ + snprintf(payload->error_buffer, sizeof(payload->error_buffer), "The requested URL returned error: %ld", payload->respcode); - _alpm_log(handle, ALPM_LOG_ERROR, + _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, payload->error_buffer); - server_soft_error(handle, payload->fileurl); + server_soft_error(handle, payload->fileurl); + } } if(curl_retry_next_server(curlm, curl, payload) == 0) { (*active_downloads_num)++;

6 19

[pacman-dev] [PATCH v2] libalpm: fix 404 pages ending up inside package downloads
by morganamilo 21 May '21

21 May '21

Previously successfull but non 200 responses would still be written to disk before trying the next server. This would lead to the next download resuming with the html response in the file. --- v2: ensure allow_resume is passed to callback Signed-off-by: morganamilo <morganamilo(a)archlinux.org> --- lib/libalpm/dload.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 2d8b4d6d..048cec5e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -404,7 +404,7 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat } /* Return 0 if retry was successful, -1 otherwise */ -static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload *payload) +static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload *payload, int allow_resume) { const char *server; size_t len; @@ -428,10 +428,9 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload MALLOC(payload->fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); snprintf(payload->fileurl, len, "%s/%s", server, payload->filepath); - fflush(payload->localf); - if(payload->allow_resume && stat(payload->tempfile_name, &st) == 0) { + if(allow_resume && stat(payload->tempfile_name, &st) == 0) { /* a previous partial download exists, resume from end of file. */ payload->tempfile_openmode = "ab"; curl_easy_setopt(curl, CURLOPT_RESUME_FROM_LARGE, (curl_off_t)st.st_size); @@ -449,7 +448,7 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload if(handle->dlcb && !payload->signature) { alpm_download_event_retry_t cb_data; - cb_data.resume = payload->allow_resume; + cb_data.resume = allow_resume; handle->dlcb(handle->dlcb_ctx, payload->remote_name, ALPM_DOWNLOAD_RETRY, &cb_data); } @@ -510,7 +509,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, payload->remote_name, hostname, payload->error_buffer); server_soft_error(handle, payload->fileurl); } - if(curl_retry_next_server(curlm, curl, payload) == 0) { + if(curl_retry_next_server(curlm, curl, payload, false) == 0) { (*active_downloads_num)++; return 2; } else { @@ -537,7 +536,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, payload->error_buffer); server_hard_error(handle, payload->fileurl); - if(curl_retry_next_server(curlm, curl, payload) == 0) { + if(curl_retry_next_server(curlm, curl, payload, payload->allow_resume) == 0) { (*active_downloads_num)++; return 2; } else { @@ -556,7 +555,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, "failed retrieving file '%s' from %s : %s\n", payload->remote_name, hostname, payload->error_buffer); } - if(curl_retry_next_server(curlm, curl, payload) == 0) { + if(curl_retry_next_server(curlm, curl, payload, payload->allow_resume) == 0) { (*active_downloads_num)++; return 2; } else { -- 2.31.1

1 1