May 2021 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Update README for pacman-6.0
by Allan McRae 18 May '21

18 May '21

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- README | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/README b/README index 4465432a..71f9a58f 100644 --- a/README +++ b/README @@ -661,10 +661,38 @@ API CHANGES BETWEEN 5.2 AND 6.0 [REMOVED] - ALPM_EVENT_PKGDOWNLOAD_START, ALPM_EVENT_PKGDOWNLOAD_DONE, ALPM_EVENT_PKGDOWNLOAD_FAILED +- old TotalDownload implementation + - alpm_cb_totaldl + - alpm_option_get_totaldlcb() + - alpm_option_set_totaldlcb() [CHANGED] -- alpm_db_update() changed its signature and now accepts a list of databases - rather than a single database. This is need to handle database downloading - in a multiplexed way. +- alpm_db_update() now accepts a list of databases rather than a single database. +- alpm_fetch_pkgurl() accepts a list of packages to download. +- alpm_db_search() now has an additional parameter and returns success status +- ALPM_EVENT_RETRIEVE_* -> ALPM_EVENT_DB_RETRIEVE_* and ALPM_EVENT_PKG_RETRIEVE_* +- alpm_cb_download pass event and data +- multi architecture support + - alpm_option_get_arch() -> alpm_option_get_architectures() + - alpm_option_set_arch() -> alpm_option_set_architectures() +- alpm_db_get_servers() copies parameter data [ADDED] +- parallel download support + - alpm_option_set_parallel_downloads() + - alpm_option_get_parallel_downloads() +- file download events + - alpm_download_event_type_t + - alpm_download_event_init_t + - alpm_download_event_progress_t + - alpm_download_event_completed_t +- download misc + - ALPM_DOWNLOAD_RETRY + - alpm_download_event_retry_t + - alpm_event_pkg_retrieve_t +- multiarchitecture support + - alpm_option_add_architecture() + - alpm_option_remove_architecture() +- misc + - alpm_pkg_get_sig() +- callbacks add front-end provided context -- 2.31.1

1 0

[pacman-dev] [PATCH] libalpm: remove unused error value
by morganamilo 18 May '21

18 May '21

--- lib/libalpm/alpm.h | 2 -- lib/libalpm/error.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c4acc062..a5f4a6ae 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -292,8 +292,6 @@ typedef enum _alpm_errno_t { ALPM_ERR_PKG_INVALID_NAME, /** Package has an invalid architecture */ ALPM_ERR_PKG_INVALID_ARCH, - /** Unused */ - ALPM_ERR_PKG_REPO_NOT_FOUND, /* Signatures */ /** Signatures are missing */ ALPM_ERR_SIG_MISSING, diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index c06d091a..c1a16cee 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -125,8 +125,6 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("package filename is not valid"); case ALPM_ERR_PKG_INVALID_ARCH: return _("package architecture is not valid"); - case ALPM_ERR_PKG_REPO_NOT_FOUND: - return _("could not find repository for target"); /* Signatures */ case ALPM_ERR_SIG_MISSING: return _("missing PGP signature"); -- 2.31.1

3 4

[pacman-dev] [PATCH] libalpm: fix alpm_fetch_pkgurl with a fetch callback
by Guillaume Benoit 18 May '21

18 May '21

After download, alpm_fetch_pkgurl uses payload->destfile_name and payload->tempfile_name in order to find the downloaded file path. Those fields are not set if a custom fetch callback is defined. Use filecache_find_url instead, like in the beginning of the function. --- lib/libalpm/dload.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 6f33451a..d45c7707 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -1007,16 +1007,11 @@ int SYMEXPORT alpm_fetch_pkgurl(alpm_handle_t *handle, const alpm_list_t *urls, EVENT(handle, &event); } - for(i = payloads; i; i = i->next) { - struct dload_payload *payload = i->data; - char *filepath; + for(i = urls; i; i = i->next) { + char *url = i->data; - if(payload->destfile_name) { - const char *filename = mbasename(payload->destfile_name); - filepath = _alpm_filecache_find(handle, filename); - } else { - STRDUP(filepath, payload->tempfile_name, GOTO_ERR(handle, ALPM_ERR_MEMORY, err)); - } + /* attempt again to find the file in our pkgcache */ + char *filepath = filecache_find_url(handle, url); if(filepath) { alpm_list_append(fetched, filepath); } else { -- 2.31.1

3 9

[pacman-dev] [PATCH] Update maintainers list
by Allan McRae 18 May '21

18 May '21

Update to relflect the current state of affairs. Add Morgan, drop Dave. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Morgan has been contributing patches consistently over the last couple of releases - in the top 3 patch contributors for both the 5.2 and 6.0 releases, and in the top 10 of patch submitters overall. Being a maintainer comes with the added responsibility of doing a bit of patch review! (I am always looking for more eyes on patches!) doc/footer.asciidoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/footer.asciidoc b/doc/footer.asciidoc index 1bae8b20..edf36080 100644 --- a/doc/footer.asciidoc +++ b/doc/footer.asciidoc @@ -18,8 +18,8 @@ Current maintainers: * Allan McRae <allan(a)archlinux.org> * Andrew Gregory <andrew.gregory.8(a)gmail.com> -* Dave Reisner <dreisner(a)archlinux.org> * Eli Schwartz <eschwartz(a)archlinux.org> +* Morgan Adamiec <morganamilo(a)archlinux.org> Past major contributors: @@ -29,6 +29,7 @@ Past major contributors: * Dan McGee <dan(a)archlinux.org> * Xavier Chantry <shiningxc(a)gmail.com> * Nagy Gabor <ngaba(a)bibl.u-szeged.hu> +* Dave Reisner <dreisner(a)archlinux.org> For additional contributors, use `git shortlog -s` on the pacman.git repository. -- 2.31.1

1 0

[pacman-dev] [PATCH] Silence new warning with gcc-11
by Allan McRae 17 May '21

17 May '21

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 99ad716e..75c74f8b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -677,7 +677,7 @@ void cb_progress(void *ctx, alpm_progress_t event, const char *pkgname, int i = textlen - 3; wchar_t *p = wcstr; /* grab the max number of char columns we can fill */ - while(i - wcwidth(*p) > 0) { + while(i > wcwidth(*p)) { i -= wcwidth(*p); p++; } -- 2.31.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-113-g618fa4f6
by Allan McRae 17 May '21

17 May '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 618fa4f675594798825a01bd0a3462903dda6ef7 (commit) via d6ffa7f56134b37efb0ea798dc6a0013e8a4d561 (commit) via 8bf17b29a24802c587afda0e96d93b22c5f5caeb (commit) via 4fead44e3ce97d3a83ca6bab393d480746ba9227 (commit) via 15be417c17809cbf2721a3fb0c519ee910b8d0a6 (commit) via 31c42c338b717ea6e0cae92c2279d859a882d1b3 (commit) from ef14c3380da0ed0e3eeba7e8b6c66294db316883 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 618fa4f675594798825a01bd0a3462903dda6ef7 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun May 9 15:18:17 2021 +0100 libalpm: check for duplicate filenames This partially fixes FS#67850 It fixes the case for -S'ing packages but not -U'ing urls. pacman -S a/a b/b resolving dependencies... error: packages a and b have the same filename: a-1-1-any.pkg.tar.zst error: failed to prepare transaction (duplicate filename) Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d6ffa7f56134b37efb0ea798dc6a0013e8a4d561 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun May 9 15:18:18 2021 +0100 fix formatting mistake Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8bf17b29a24802c587afda0e96d93b22c5f5caeb Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun May 9 14:23:57 2021 +0100 libalpm: fix download rates becoming negative When a download fails on one mirror a new download is started on the next mirror. This causes the ammount downloaded to reset, confusing the rate math and making it display a negative rate. This is further complicated by the fact that a download may be resumed from where it is or started over. To account for this we alert the frontend that the download was restarted. Pacman then starts the progress bar over. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4fead44e3ce97d3a83ca6bab393d480746ba9227 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun May 9 13:18:38 2021 +0100 libalpm: clone data on alpm_db_set_servers Every alpm_option_set function clones the input so lets be more consistent. Also this fixes servers not being sanatized. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15be417c17809cbf2721a3fb0c519ee910b8d0a6 Author: morganamilo <morganamilo(a)archlinux.org> Date: Fri May 7 07:26:12 2021 +0100 remove unused variable in meson.build Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 31c42c338b717ea6e0cae92c2279d859a882d1b3 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun Apr 18 20:59:45 2021 +0100 Match initial download message with progress message When initially downloading a package, pacman will display a message like: wine-6.6-1-x86_64.pkg.tar.zst downloading... Then when the download progresses the message will change to: wine-6.6-1-x86_64.pkg.tar.zst So instead lets match the progress message so there's no sudden change. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 16 ++++++++++++---- lib/libalpm/db.c | 8 +++++++- lib/libalpm/dload.c | 33 +++++++++++++++++++++++++-------- lib/libalpm/error.c | 2 ++ lib/libalpm/sync.c | 19 +++++++++++++++++++ lib/libalpm/trans.c | 2 +- meson.build | 1 - src/pacman/callback.c | 34 ++++++++++++++++++++++++++++++++-- 8 files changed, 98 insertions(+), 17 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2 3/4] libalpm: check for duplicate filenames
by morganamilo 09 May '21

09 May '21

This partially fixes FS#67850 It fixes the case for -S'ing packages but not -U'ing urls. pacman -S a/a b/b resolving dependencies... error: packages a and b have the same filename: a-1-1-any.pkg.tar.zst error: failed to prepare transaction (duplicate filename) --- lib/libalpm/alpm.h | 2 ++ lib/libalpm/error.c | 2 ++ lib/libalpm/sync.c | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 833df829..ccf2edc2 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -257,6 +257,8 @@ typedef enum _alpm_errno_t { ALPM_ERR_TRANS_NULL, /** Duplicate target in transaction */ ALPM_ERR_TRANS_DUP_TARGET, + /** Duplicate filename in transaction */ + ALPM_ERR_TRANS_DUP_FILENAME, /** A transaction has not been initialized */ ALPM_ERR_TRANS_NOT_INITIALIZED, /** Transaction has not been prepared */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index c6f19599..c06d091a 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -90,6 +90,8 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("transaction not initialized"); case ALPM_ERR_TRANS_DUP_TARGET: return _("duplicate target"); + case ALPM_ERR_TRANS_DUP_FILENAME: + return _("duplicate filename"); case ALPM_ERR_TRANS_NOT_INITIALIZED: return _("transaction not initialized"); case ALPM_ERR_TRANS_NOT_PREPARED: diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7fa50a13..8ccb0ba0 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -464,6 +464,25 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } } + /* Ensure two packages don't have the same filename */ + for(i = resolved; i; i = i->next) { + alpm_pkg_t *pkg1 = i->data; + for(j = i->next; j; j = j->next) { + alpm_pkg_t *pkg2 = j->data; + if(strcmp(pkg1->filename, pkg2->filename) == 0) { + alpm_list_free(resolved); + ret = -1; + handle->pm_errno = ALPM_ERR_TRANS_DUP_FILENAME; + _alpm_log(handle, ALPM_LOG_ERROR, _("packages %s and %s have the same filename: %s\n"), + pkg1->name, pkg2->name, pkg1->filename); + } + } + } + + if(ret != 0) { + goto cleanup; + } + /* Set DEPEND reason for pulled packages */ for(i = resolved; i; i = i->next) { alpm_pkg_t *pkg = i->data; -- 2.31.1

1 1

[pacman-dev] [PATCH v3] libalpm: fix download rates becoming negative
by morganamilo 09 May '21

09 May '21

When a download fails on one mirror a new download is started on the next mirror. This causes the ammount downloaded to reset, confusing the rate math and making it display a negative rate. This is further complicated by the fact that a download may be resumed from where it is or started over. To account for this we alert the frontend that the download was restarted. Pacman then starts the progress bar over. --- v2: stat tempfile to get initial_size v3: review fixes --- lib/libalpm/alpm.h | 7 +++++++ lib/libalpm/dload.c | 33 +++++++++++++++++++++++++-------- src/pacman/callback.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 101d686b..226fd953 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1172,6 +1172,8 @@ typedef enum _alpm_download_event_type_t { ALPM_DOWNLOAD_INIT, /** A download made progress */ ALPM_DOWNLOAD_PROGRESS, + /** Download will be retried */ + ALPM_DOWNLOAD_RETRY, /** A download completed */ ALPM_DOWNLOAD_COMPLETED } alpm_download_event_type_t; @@ -1190,6 +1192,11 @@ typedef struct _alpm_download_event_progress_t { off_t total; } alpm_download_event_progress_t; +/** Context struct for when a download retries. */ +typedef struct _alpm_download_event_retry_t { + /** If the download will resume or start over */ + int resume; +} alpm_download_event_retry_t; /** Context struct for when a download completes. */ typedef struct _alpm_download_event_completed_t { diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 8fa46bb2..2d8b4d6d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -408,6 +408,7 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload { const char *server; size_t len; + struct stat st; alpm_handle_t *handle = payload->handle; while(payload->servers && should_skip_server(handle, payload->servers->data)) { @@ -427,15 +428,31 @@ 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); - if(payload->unlink_on_fail) { + + fflush(payload->localf); + + if(payload->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); + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s: tempfile found, attempting continuation from %jd bytes\n", + payload->remote_name, (intmax_t)st.st_size); + payload->initial_size = st.st_size; + } else { /* we keep the file for a new retry but remove its data if any */ - fflush(payload->localf); if(ftruncate(fileno(payload->localf), 0)) { RET_ERR(handle, ALPM_ERR_SYSTEM, -1); } fseek(payload->localf, 0, SEEK_SET); } + if(handle->dlcb && !payload->signature) { + alpm_download_event_retry_t cb_data; + cb_data.resume = payload->allow_resume; + handle->dlcb(handle->dlcb_ctx, payload->remote_name, ALPM_DOWNLOAD_RETRY, &cb_data); + } + /* Set curl with the new URL */ curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); @@ -483,7 +500,6 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, _alpm_log(handle, ALPM_LOG_DEBUG, "%s: response code %ld\n", payload->remote_name, payload->respcode); if(payload->respcode >= 400) { - payload->unlink_on_fail = 1; if(!payload->errors_ok) { handle->pm_errno = ALPM_ERR_RETRIEVE; /* non-translated message is same as libcurl */ @@ -498,6 +514,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, (*active_downloads_num)++; return 2; } else { + payload->unlink_on_fail = 1; goto cleanup; } } @@ -515,7 +532,6 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, } goto cleanup; case CURLE_COULDNT_RESOLVE_HOST: - payload->unlink_on_fail = 1; handle->pm_errno = ALPM_ERR_SERVER_BAD_URL; _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), @@ -525,13 +541,10 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, (*active_downloads_num)++; return 2; } else { + payload->unlink_on_fail = 1; goto cleanup; } default: - /* delete zero length downloads */ - if(fstat(fileno(payload->localf), &st) == 0 && st.st_size == 0) { - payload->unlink_on_fail = 1; - } if(!payload->errors_ok) { handle->pm_errno = ALPM_ERR_LIBCURL; _alpm_log(handle, ALPM_LOG_ERROR, @@ -547,6 +560,10 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, (*active_downloads_num)++; return 2; } else { + /* delete zero length downloads */ + if(fstat(fileno(payload->localf), &st) == 0 && st.st_size == 0) { + payload->unlink_on_fail = 1; + } goto cleanup; } } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index ae7e1bed..1881f8ac 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -994,6 +994,34 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr fflush(stdout); } +/* download retried */ +static void dload_retry_event(const char *filename, alpm_download_event_retry_t *data) { + if(!dload_progressbar_enabled()) { + return; + } + + int index; + struct pacman_progress_bar *bar; + bool ok = find_bar_for_filename(filename, &index, &bar); + assert(ok); + + if(!data->resume) { + if(total_enabled) { + /* note total download does not reflect partial downloads that are restarted */ + totalbar->xfered -= bar->xfered; + } + } + + bar->xfered = 0; + bar->total_size = 0; + bar->init_time = get_time_ms(); + bar->sync_time = 0; + bar->sync_xfered = 0; + bar->rate = 0.0; + bar->eta = 0.0; +} + + /* download completed */ static void dload_complete_event(const char *filename, alpm_download_event_completed_t *data) { @@ -1090,6 +1118,8 @@ void cb_download(void *ctx, const char *filename, alpm_download_event_type_t eve dload_init_event(filename, data); } else if(event == ALPM_DOWNLOAD_PROGRESS) { dload_progress_event(filename, data); + } else if(event == ALPM_DOWNLOAD_RETRY) { + dload_retry_event(filename, data); } else if(event == ALPM_DOWNLOAD_COMPLETED) { dload_complete_event(filename, data); } else { -- 2.31.1

1 0

[pacman-dev] [PATCH] libalpm: check for duplicate filenames
by morganamilo 09 May '21

09 May '21

This partially fixes FS#67850 It fixes the case for -S'ing packages but not -U'ing urls. morganamilo@Octavia dup ~git/pacman % sudo ./build/pacman -S a/a b/b resolving dependencies... error: a and b have the same filename: a-1-1-any.pkg.tar.zst error: failed to prepare transaction (duplicate filename) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 833df829..ccf2edc2 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -257,6 +257,8 @@ typedef enum _alpm_errno_t { ALPM_ERR_TRANS_NULL, /** Duplicate target in transaction */ ALPM_ERR_TRANS_DUP_TARGET, + /** Duplicate filename in transaction */ + ALPM_ERR_TRANS_DUP_FILENAME, /** A transaction has not been initialized */ ALPM_ERR_TRANS_NOT_INITIALIZED, /** Transaction has not been prepared */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index c6f19599..c06d091a 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -90,6 +90,8 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("transaction not initialized"); case ALPM_ERR_TRANS_DUP_TARGET: return _("duplicate target"); + case ALPM_ERR_TRANS_DUP_FILENAME: + return _("duplicate filename"); case ALPM_ERR_TRANS_NOT_INITIALIZED: return _("transaction not initialized"); case ALPM_ERR_TRANS_NOT_PREPARED: diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7fa50a13..73e9e77d 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -464,6 +464,25 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } } + /* Ensure two packages don't have the same filename */ + for(i = resolved; i; i = i->next) { + alpm_pkg_t *pkg1 = i->data; + for(j = i->next; j; j = j->next) { + alpm_pkg_t *pkg2 = j->data; + if(strcmp(pkg1->filename, pkg2->filename) == 0) { + alpm_list_free(resolved); + ret = -1; + handle->pm_errno = ALPM_ERR_TRANS_DUP_FILENAME; + _alpm_log(handle, ALPM_LOG_ERROR, _("%s and %s have the same filename: %s\n"), + pkg1->name, pkg2->name, pkg1->filename); + } + } + } + + if(ret != 0) { + goto cleanup; + } + /* Set DEPEND reason for pulled packages */ for(i = resolved; i; i = i->next) { alpm_pkg_t *pkg = i->data; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c6ec7eea..4cee603c 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -122,7 +122,7 @@ int SYMEXPORT alpm_trans_prepare(alpm_handle_t *handle, alpm_list_t **data) /* pm_errno is set by _alpm_remove_prepare() */ return -1; } - } else { + } else { if(_alpm_sync_prepare(handle, data) == -1) { /* pm_errno is set by _alpm_sync_prepare() */ return -1; -- 2.31.1

2 1

[pacman-dev] [PATCH] libalpm: download rates becoming negative
by morganamilo 09 May '21

09 May '21

When a download fails on one mirror a new download is started on the next mirror. This new download will have the initial size of whatever has been downloaded so far, as well as the ammount downloaded reset to 0. To account for this, when a download changes mirror, save how much has been downloaded so far and add that to dlcb calls. --- lib/libalpm/dload.c | 14 ++++++++++++-- lib/libalpm/dload.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a4c42f8d..27a7748a 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -207,8 +207,8 @@ static int dload_progress_cb(void *file, curl_off_t dltotal, curl_off_t dlnow, /* do NOT include initial_size since it wasn't part of the package's * download_size (nor included in the total download size callback) */ - cb_data.total = dltotal; - cb_data.downloaded = dlnow; + cb_data.total = dltotal + payload->resetprogress; + cb_data.downloaded = dlnow + payload->resetprogress; payload->handle->dlcb(payload->remote_name, ALPM_DOWNLOAD_PROGRESS, &cb_data); payload->prevprogress = current_size; @@ -440,6 +440,16 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload fseek(payload->localf, 0, SEEK_SET); } + + /* reset progress for next server */ + payload->resetprogress += payload->prevprogress - payload->initial_size; + payload->unlink_on_fail = 0; + + if(payload->allow_resume) { + payload->initial_size = payload->prevprogress; + } + + /* Set curl with the new URL */ curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 8f3d17b4..abfd9466 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -42,6 +42,7 @@ struct dload_payload { off_t initial_size; off_t max_size; off_t prevprogress; + off_t resetprogress; /* progress made before we try a new server */ int force; int allow_resume; int errors_ok; -- 2.31.1

5 15