- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] doc: make doxygen build from any directory
by Eli Schwartz 29 Dec '20

29 Dec '20

In the autotools build, it only built in-tree, from cwd = doc/ and resolving doc/../lib/libalpm In the meson build, this accidentally worked if cwd = pacman/builddir/ and resolved to builddir/../lib/libalpm/ But... this should always have been configured with the actual path to the inputs. So, we will now proceed to do so. Fixes building man3 if your out of tree builddir doesn't happen to be a direct subdirectory of the source root. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/Doxyfile.in | 4 ++-- doc/meson.build | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 776318da7..6744e7659 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -117,8 +117,8 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # Configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../lib/libalpm/alpm.h \ - ../lib/libalpm/alpm_list.h +INPUT = @INPUT_DIRECTORY@/../lib/libalpm/alpm.h \ + @INPUT_DIRECTORY@/../lib/libalpm/alpm_list.h INPUT_ENCODING = UTF-8 FILE_PATTERNS = RECURSIVE = NO diff --git a/doc/meson.build b/doc/meson.build index 570dc7654..4aaac5540 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -135,6 +135,7 @@ meson.add_install_script(MESON_MAKE_SYMLINK, doxygen = find_program('doxygen', required : get_option('doxygen')) if doxygen.found() and not get_option('doxygen').disabled() doxyconf = configuration_data() + doxyconf.set('INPUT_DIRECTORY', meson.current_source_dir()) doxyconf.set('OUTPUT_DIRECTORY', meson.current_build_dir()) doxyfile = configure_file( input : 'Doxyfile.in', -- 2.29.2

1 0

[pacman-dev] [PATCH 1/2] libalpm: const annotate struct pkg_operations
by Emil Velikov 23 Dec '20

23 Dec '20

Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 20 ++++++++++++++++++-- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 4 ++-- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index e73a97bb..9c3c8bb3 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -326,7 +326,7 @@ static int _cache_force_load(alpm_pkg_t *pkg) * lazy accessor methods that handle any backend loading and caching * logic. */ -static struct pkg_operations local_pkg_ops = { +static const struct pkg_operations local_pkg_ops = { .get_base = _cache_get_base, .get_desc = _cache_get_desc, .get_url = _cache_get_url, diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 4dde7167..f855003a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -138,7 +138,7 @@ static int _package_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp) * majority of the default_pkg_ops struct and add only a few operations of * our own on top. */ -static struct pkg_operations *get_file_pkg_ops(void) +static const struct pkg_operations *get_file_pkg_ops(void) { static struct pkg_operations file_pkg_ops; static int file_pkg_ops_initialized = 0; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 225df76d..5356b544 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -281,6 +281,23 @@ static int _sync_get_validation(alpm_pkg_t *pkg) return pkg->validation; } +/** Package sync operations struct accessor. We implement this as a method + * rather than a static struct as in be_files because we want to reuse the + * majority of the default_pkg_ops struct and add only a few operations of + * our own on top. + */ +static const struct pkg_operations *get_sync_pkg_ops(void) +{ + static struct pkg_operations sync_pkg_ops; + static int sync_pkg_ops_initalized = 0; + if(!sync_pkg_ops_initalized) { + sync_pkg_ops = default_pkg_ops; + sync_pkg_ops.get_validation = _sync_get_validation; + sync_pkg_ops_initalized = 1; + } + return &sync_pkg_ops; +} + static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname, const char **entry_filename, alpm_pkg_t *likely_pkg) { @@ -321,8 +338,7 @@ static alpm_pkg_t *load_pkg_for_entry(alpm_db_t *db, const char *entryname, pkg->origin = ALPM_PKG_FROM_SYNCDB; pkg->origin_data.db = db; - pkg->ops = &default_pkg_ops; - pkg->ops->get_validation = _sync_get_validation; + pkg->ops = get_sync_pkg_ops(); pkg->handle = db->handle; /* add to the collection */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index a4356518..5766c600 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -138,7 +138,7 @@ static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; } /** The standard package operations struct. Get fields directly from the * struct itself with no abstraction layer or any type of lazy loading. */ -struct pkg_operations default_pkg_ops = { +const struct pkg_operations default_pkg_ops = { .get_base = _pkg_get_base, .get_desc = _pkg_get_desc, .get_url = _pkg_get_url, diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index c37bd11e..b134ad5a 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -83,7 +83,7 @@ struct pkg_operations { * The actual definition is in package.c so it can have access to the * default accessor functions which are defined there. */ -extern struct pkg_operations default_pkg_ops; +extern const struct pkg_operations default_pkg_ops; struct __alpm_pkg_t { unsigned long name_hash; @@ -121,7 +121,7 @@ struct __alpm_pkg_t { alpm_list_t *removes; /* in transaction targets only */ alpm_pkg_t *oldpkg; /* in transaction targets only */ - struct pkg_operations *ops; + const struct pkg_operations *ops; alpm_filelist_t files; -- 2.29.2

2 2

[pacman-dev] [PATCH 00/23] Docs Docs Docs 2: electric boogaloo
by morganamilo 21 Dec '20

21 Dec '20

Here's a redo of my original docs patch and more. This time it's split in to many commits so it's hopefully easier to review/rebase. Every function, struct and param is now documented. Simply `man libalpm` to get the main page. Then `man libalpm-databases` to see the database section and so on for each section. Also while doing all this, I thought it would make sense to change some function names: I also think alpm_unlock() should be named alpm_db_unlock() and alpm_sync_get_new_version() should be named alpm_pkg_get_new_version() Then the functions could be moved into the db and packages groups repectivley. To be clear I have not actually changed any function names in this patch set. morganamilo (23): doc: remove stray doxygen comment doc: add doc header to alpm.h doc: document error doc: document handle doc: document signatures doc: document depends doc: document callbacks doc: document databases doc: document logging doc: document packages doc: document files and groups doc: document transactions doc: document misc doc: document alpm_list doc: document options doc: move alpm_api group to top of file doc: move top level items into groups doc: configure doxygen doc: update doxyfile doc: rename alpm_api group to alpm doc: add extra documentation to the man page doc: change group names to libalpm_* doc: remove old libalpm man file doc/Doxyfile.in | 83 +- doc/libalpm.3.asciidoc | 37 - doc/meson.build | 1 - lib/libalpm/alpm.h | 2429 +++++++++++++++++++++++++++------------ lib/libalpm/alpm_list.c | 251 ---- lib/libalpm/alpm_list.h | 293 ++++- lib/libalpm/trans.c | 2 - 7 files changed, 2048 insertions(+), 1048 deletions(-) delete mode 100644 doc/libalpm.3.asciidoc -- 2.29.2

4 34

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-23-g95ffdd68
by Allan McRae 21 Dec '20

21 Dec '20

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 95ffdd68b250af1d37067fe6dd70fc6a6094bc62 (commit) via e67c306f9199fe1fc5e2c82dcaf3ede851a1689c (commit) via ea975c328da8ebae2e13b8ce5c75c319fa3c4ef9 (commit) via 50c9c338fbbdc895484ccaf4043187c56fc8687b (commit) via 6ed82820fe3994c0375c4981be7978c0ba54727a (commit) via 1e8816f13d651997034252d87fba51cd38118f51 (commit) via 2a16434bfd20cc55e554018f5a34870dbca09673 (commit) via 4613527738ce428f2bc8e2b9bc404a1f662d5d99 (commit) via 7b06b5407baffc3895e0861241a048048b6c5788 (commit) via 50d2171ef0a77e0d967195046867adc80ed3efcb (commit) via a321e1f8a539097cf797b21bf69178a71edb9b12 (commit) via 3d60a829e1d3e16116dea1032a3ab1365e471c8c (commit) via 5901ac9cb27595a36edc7b818b94c3fa0271f37e (commit) via af7a1e834f262a24d6ed5eea472ac45830ab1229 (commit) via 55efa43f2305801640f8312e9d494856b8a0a781 (commit) via e9ac13776e7a1aa5899cfdc9a4233d84835c094f (commit) via bf26b6bbf7ee83211c3bcbb5fca05e6aef48b18a (commit) via 5e9635317b46d908f482128e8db63ccdae04aa28 (commit) via ab431f6810ed49045a95fe232cd678d39708fc02 (commit) via 49e33aad7c848c06ca276c71f2db5c057a129178 (commit) via 48c8869339e739b44e0195ded69f1bdc8695b888 (commit) via 48865e7dac673648b8fb96f4cfa2b2994b597983 (commit) from 11e09a23beb89c3b7bf06209a317a4b6ac75ee38 (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 95ffdd68b250af1d37067fe6dd70fc6a6094bc62 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:56 2020 +0000 doc: remove old libalpm man file Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e67c306f9199fe1fc5e2c82dcaf3ede851a1689c Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:54 2020 +0000 doc: add extra documentation to the man page Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ea975c328da8ebae2e13b8ce5c75c319fa3c4ef9 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:53 2020 +0000 doc: rename alpm_api group to alpm Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 50c9c338fbbdc895484ccaf4043187c56fc8687b Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:52 2020 +0000 doc: update doxyfile Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6ed82820fe3994c0375c4981be7978c0ba54727a Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:51 2020 +0000 doc: configure doxygen - only document public alpm items (alpm_*) - hide typedef'd structs (_alpm_pkg_t shows as alpm_pkg_t) - enable inline struct definitions (this stops having a man page for every single struct) Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e8816f13d651997034252d87fba51cd38118f51 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:50 2020 +0000 doc: move top level items into groups Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2a16434bfd20cc55e554018f5a34870dbca09673 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:49 2020 +0000 doc: move alpm_api group to top of file Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4613527738ce428f2bc8e2b9bc404a1f662d5d99 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:48 2020 +0000 doc: document options Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7b06b5407baffc3895e0861241a048048b6c5788 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:47 2020 +0000 doc: document alpm_list Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 50d2171ef0a77e0d967195046867adc80ed3efcb Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:46 2020 +0000 doc: document misc Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a321e1f8a539097cf797b21bf69178a71edb9b12 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:45 2020 +0000 doc: document transactions Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3d60a829e1d3e16116dea1032a3ab1365e471c8c Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:44 2020 +0000 doc: document files and groups Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5901ac9cb27595a36edc7b818b94c3fa0271f37e Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:43 2020 +0000 doc: document packages Signed-off-by: Allan McRae <allan(a)archlinux.org> commit af7a1e834f262a24d6ed5eea472ac45830ab1229 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:42 2020 +0000 doc: document logging Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 55efa43f2305801640f8312e9d494856b8a0a781 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:41 2020 +0000 doc: document databases Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e9ac13776e7a1aa5899cfdc9a4233d84835c094f Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:40 2020 +0000 doc: document callbacks Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bf26b6bbf7ee83211c3bcbb5fca05e6aef48b18a Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:39 2020 +0000 doc: document depends Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5e9635317b46d908f482128e8db63ccdae04aa28 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:38 2020 +0000 doc: document signatures Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ab431f6810ed49045a95fe232cd678d39708fc02 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:37 2020 +0000 doc: document handle Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 49e33aad7c848c06ca276c71f2db5c057a129178 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:36 2020 +0000 doc: document error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 48c8869339e739b44e0195ded69f1bdc8695b888 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:35 2020 +0000 doc: add doc header to alpm.h Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 48865e7dac673648b8fb96f4cfa2b2994b597983 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Dec 7 22:19:34 2020 +0000 doc: remove stray doxygen comment Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Doxyfile.in | 83 +- doc/libalpm.3.asciidoc | 37 - doc/meson.build | 1 - lib/libalpm/alpm.h | 2410 +++++++++++++++++++++++++++++++++-------------- lib/libalpm/alpm_list.c | 251 ----- lib/libalpm/alpm_list.h | 306 +++++- lib/libalpm/trans.c | 2 - 7 files changed, 2041 insertions(+), 1049 deletions(-) delete mode 100644 doc/libalpm.3.asciidoc hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add `build/` to gitignore
by Colin Woodbury 14 Dec '20

14 Dec '20

Since it's a transient directory for build artifacts, nothing in there will ever been committed. Ignoring it also makes IDEs happier during file search. Signed-off-by: Colin Woodbury <colin(a)fosskers.ca> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 01975fd2..638dfe39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *~ *.o pacman-*.tar.gz +build/* -- 2.29.2

3 8

[pacman-dev] directory permissions differ
by Ronan Pigott 12 Dec '20

12 Dec '20

Hey guys, I'm wondering if we can remove this embedded newline in the warning message: "directory permissions differ on %s\n" ^^ "filesystem: %o package: %o\n" Going through my pacman logfile, the "filesystem: ..." line is the only one that starts a line without the usual timestamp and caller tags. It makes it slightly more annoying to parse with awk/sed or whatever and doesn't serve much of a purpose afaict. My suggested change would be: "directory permissions differ on %s, " "filesystem: %o package: %o\n" I can submit a patch if you'd like.

1 0

[pacman-dev] Location of the Pacman Home Page source?
by Colin Woodbury 09 Dec '20

09 Dec '20

Hi folks, I see that while a number of Pacman-related pages like the HACKING document are rendered into nice HTML and hosted officially, does anyone know where the source for the Pacman homepage itself is hosted (https://www.archlinux.org/pacman/)? There are some documentation lines I'd like to fix, in particular the ones that still mention configure/make as the way to compile Pacman. Meson should probably also be mentioned in the Pacman README itself, since it is otherwise cited nowhere in that repo. I'd be happy to put forth a PR. Cheers, Colin

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-1-g11e09a23
by Allan McRae 09 Dec '20

09 Dec '20

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 11e09a23beb89c3b7bf06209a317a4b6ac75ee38 (commit) from a4240a55e448ffba15a5edbad1a31cb76f821231 (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 11e09a23beb89c3b7bf06209a317a4b6ac75ee38 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Tue Dec 8 11:57:27 2020 -0800 Implement TotalDownload functionality With the recent 'multibar' interface changes TotalDownload has been disabled. Now we have a new UI and we need to find another way to display this information. When 'TotalDownload' config option is enabled we are going to have an extra progress bar at the bottom of the screen that shows how much of the entire download has been completed. Closes FS#68202 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.asciidoc | 6 +- lib/libalpm/sync.c | 5 -- src/pacman/callback.c | 146 ++++++++++++++++++++++++++++++++------------- 3 files changed, 106 insertions(+), 51 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Implement TotalDownload functionality
by Anatol Pomozov 08 Dec '20

08 Dec '20

With the recent 'multibar' interface changes TotalDownload has been disabled. Now we have a new UI and we need to find another way to display this information. When 'TotalDownload' config option is enabled we are going to have an extra progress bar at the bottom of the screen that shows how much of the entire download has been completed. Closes FS#68202 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 6 +-- lib/libalpm/sync.c | 5 -- src/pacman/callback.c | 108 ++++++++++++++++++++++++++++++++----- 3 files changed, 96 insertions(+), 23 deletions(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index dd1d3d5e..32612eb9 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -191,10 +191,8 @@ Options not support escape characters. *TotalDownload*:: - When downloading, display the amount downloaded, download rate, ETA, - and completed percentage of the entire download list rather - than the percent of each individual download target. The progress - bar is still based solely on the current file download. + When downloading, display an extra progress bar with the amount downloaded, + download rate, ETA, and completed percentage of the entire download list. This option won't work if XferCommand is used. *CheckSpace*:: diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5d8652a5..e25e56d4 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -846,11 +846,6 @@ finish: pkg->download_size = 0; } - /* clear out value to let callback know we are done */ - if(handle->totaldlcb) { - handle->totaldlcb(0); - } - return ret; } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 12ab952f..49bc3df4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -40,8 +40,9 @@ #include "conf.h" /* download progress bar */ -static off_t list_xfered = 0.0; +static int total_enabled = 0; static off_t list_total = 0.0; +static struct pacman_progress_bar *totalbar; /* delayed output during progress bar */ static int on_progress = 0; @@ -92,6 +93,10 @@ struct pacman_multibar_ui { struct pacman_multibar_ui multibar_ui = {0}; +static int dload_progressbar_enabled(void); +static void init_total_progressbar(void); +static void update_total_finalstats(void); + void multibar_move_completed_up(bool value) { multibar_ui.move_completed_up = value; } @@ -327,6 +332,10 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_START: colon_printf(_("Retrieving packages...\n")); on_progress = 1; + total_enabled = config->totaldownload && list_total; + if(total_enabled) { + init_total_progressbar(); + } break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -388,6 +397,11 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_DONE: case ALPM_EVENT_PKG_RETRIEVE_FAILED: console_cursor_move_end(); + if(total_enabled && dload_progressbar_enabled()) { + update_total_finalstats(); + printf("\n"); + } + total_enabled = 0; flush_output_list(); on_progress = 0; break; @@ -679,11 +693,6 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, void cb_dl_total(off_t total) { list_total = total; - /* if we get a 0 value, it means this list has finished downloading, - * so clear out our list_xfered as well */ - if(total == 0) { - list_xfered = 0; - } } static int dload_progressbar_enabled(void) @@ -726,6 +735,16 @@ static bool find_bar_for_filename(const char *filename, int *index, struct pacma return false; } +static void init_total_progressbar(void) +{ + totalbar = calloc(1, sizeof(struct pacman_progress_bar)); + assert(totalbar); + totalbar->filename = "Total progress:"; + totalbar->init_time = get_time_ms(); + totalbar->total_size = list_total; + totalbar->rate = 0.0; +} + static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) { int infolen; @@ -851,10 +870,17 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d printf(_(" %s downloading...\n"), filename); multibar_ui.cursor_lineno++; multibar_ui.active_downloads_num++; + + if(total_enabled) { + /* redraw the total download progress bar */ + draw_pacman_progress_bar(totalbar); + printf("\n"); + multibar_ui.cursor_lineno++; + } } -/* Draws download progress */ -static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) + +static off_t update_file_dload_bar(const char *filename, alpm_download_event_progress_t *data) { int index; struct pacman_progress_bar *bar; @@ -862,10 +888,7 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr double last_chunk_rate; int64_t timediff; bool ok; - - if(!dload_progressbar_enabled()) { - return; - } + off_t last_chunk_amount; ok = find_bar_for_filename(filename, &index, &bar); assert(ok); @@ -875,11 +898,12 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr if(timediff < UPDATE_SPEED_MS) { /* return if the calling interval was too short */ - return; + return 0; } bar->sync_time = curr_time; - last_chunk_rate = (double)(data->downloaded - bar->xfered) / (timediff / 1000.0); + last_chunk_amount = data->downloaded - bar->xfered; + last_chunk_rate = (double)last_chunk_amount * 1000 / timediff; /* average rate to reduce jumpiness */ bar->rate = (last_chunk_rate + 2 * bar->rate) / 3; if(bar->rate > 0.0) { @@ -894,6 +918,62 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr console_cursor_goto_bar(index); draw_pacman_progress_bar(bar); + + return last_chunk_amount; +} + +static void update_total_dload_bar(off_t last_chunk_amount) +{ + int64_t curr_time = get_time_ms(); + int64_t timediff; + double last_chunk_rate; + + timediff = curr_time - totalbar->init_time; + totalbar->xfered += last_chunk_amount; + last_chunk_rate = (double)totalbar->xfered * 1000 / timediff; + totalbar->rate = (last_chunk_rate + 2 * totalbar->rate) / 3; + totalbar->eta = (totalbar->total_size - totalbar->xfered) / totalbar->rate; + + console_cursor_move_end(); + draw_pacman_progress_bar(totalbar); +} + +static void update_total_finalstats(void) +{ + int64_t timediff; + + /* compute final values */ + totalbar->xfered = totalbar->total_size; + timediff = get_time_ms() - totalbar->init_time; + + /* if transfer was too fast, treat it as a 1ms transfer, for the sake + * of the rate calculation */ + if(timediff < 1) + timediff = 1; + + totalbar->rate = (double)totalbar->xfered * 1000 / timediff; + /* round elapsed time (in ms) to the nearest second */ + totalbar->eta = (unsigned int)(timediff + 500) / 1000; + + console_cursor_move_end(); + draw_pacman_progress_bar(totalbar); +} + +/* Handles download progress event */ +static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) +{ + off_t last_chunk_amount; + + if(!dload_progressbar_enabled()) { + return; + } + + last_chunk_amount = update_file_dload_bar(filename, data); + + if(total_enabled && last_chunk_amount) { + update_total_dload_bar(last_chunk_amount); + } + fflush(stdout); } -- 2.29.2

2 4

[pacman-dev] [PATCH v2] Implement TotalDownload functionality
by Anatol Pomozov 08 Dec '20

08 Dec '20

With the recent 'multibar' interface changes TotalDownload has been disabled. Now we have a new UI and we need to find another way to display this information. When 'TotalDownload' config option is enabled we are going to have an extra progress bar at the bottom of the screen that shows how much of the entire download has been completed. Closes FS#68202 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 6 +- lib/libalpm/sync.c | 5 -- src/pacman/callback.c | 146 ++++++++++++++++++++++++++----------- 3 files changed, 106 insertions(+), 51 deletions(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index dd1d3d5e..32612eb9 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -191,10 +191,8 @@ Options not support escape characters. *TotalDownload*:: - When downloading, display the amount downloaded, download rate, ETA, - and completed percentage of the entire download list rather - than the percent of each individual download target. The progress - bar is still based solely on the current file download. + When downloading, display an extra progress bar with the amount downloaded, + download rate, ETA, and completed percentage of the entire download list. This option won't work if XferCommand is used. *CheckSpace*:: diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5d8652a5..e25e56d4 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -846,11 +846,6 @@ finish: pkg->download_size = 0; } - /* clear out value to let callback know we are done */ - if(handle->totaldlcb) { - handle->totaldlcb(0); - } - return ret; } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 12ab952f..9cc7541d 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -40,8 +40,9 @@ #include "conf.h" /* download progress bar */ -static off_t list_xfered = 0.0; +static int total_enabled = 0; static off_t list_total = 0.0; +static struct pacman_progress_bar *totalbar; /* delayed output during progress bar */ static int on_progress = 0; @@ -56,10 +57,12 @@ static alpm_list_t *output = NULL; struct pacman_progress_bar { const char *filename; - off_t xfered; + off_t xfered; /* Current amount of transferred data */ off_t total_size; uint64_t init_time; /* Time when this download started doing any progress */ uint64_t sync_time; /* Last time we updated the bar info */ + off_t sync_xfered; /* Amount of transferred data at the `sync_time` timestamp. It can be + smaller than `xfered` if we did not update bar UI for a while. */ double rate; unsigned int eta; /* ETA in seconds */ bool completed; /* transfer is completed */ @@ -92,6 +95,11 @@ struct pacman_multibar_ui { struct pacman_multibar_ui multibar_ui = {0}; +static int dload_progressbar_enabled(void); +static void init_total_progressbar(void); +static void update_bar_finalstats(struct pacman_progress_bar *bar); +static void draw_pacman_progress_bar(struct pacman_progress_bar *bar); + void multibar_move_completed_up(bool value) { multibar_ui.move_completed_up = value; } @@ -327,6 +335,10 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_START: colon_printf(_("Retrieving packages...\n")); on_progress = 1; + total_enabled = config->totaldownload && list_total; + if(total_enabled) { + init_total_progressbar(); + } break; case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { @@ -388,6 +400,12 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_DONE: case ALPM_EVENT_PKG_RETRIEVE_FAILED: console_cursor_move_end(); + if(total_enabled && dload_progressbar_enabled()) { + update_bar_finalstats(totalbar); + draw_pacman_progress_bar(totalbar); + printf("\n"); + } + total_enabled = 0; flush_output_list(); on_progress = 0; break; @@ -679,11 +697,6 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, void cb_dl_total(off_t total) { list_total = total; - /* if we get a 0 value, it means this list has finished downloading, - * so clear out our list_xfered as well */ - if(total == 0) { - list_xfered = 0; - } } static int dload_progressbar_enabled(void) @@ -726,6 +739,16 @@ static bool find_bar_for_filename(const char *filename, int *index, struct pacma return false; } +static void init_total_progressbar(void) +{ + totalbar = calloc(1, sizeof(struct pacman_progress_bar)); + assert(totalbar); + totalbar->filename = _("Total:"); + totalbar->init_time = get_time_ms(); + totalbar->total_size = list_total; + totalbar->rate = 0.0; +} + static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) { int infolen; @@ -742,7 +765,7 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) const unsigned short cols = getcols(); if(bar->total_size) { - file_percent = (bar->xfered * 100) / bar->total_size; + file_percent = (bar->sync_xfered * 100) / bar->total_size; } else { file_percent = 100; } @@ -802,7 +825,7 @@ static void draw_pacman_progress_bar(struct pacman_progress_bar *bar) } rate_human = humanize_size((off_t)bar->rate, '\0', -1, &rate_label); - xfered_human = humanize_size(bar->xfered, '\0', -1, &xfered_label); + xfered_human = humanize_size(bar->sync_xfered, '\0', -1, &xfered_label); printf(" %ls%-*s ", wcfname, padwid, ""); /* We will show 1.62 MiB/s, 11.6 MiB/s, but 116 KiB/s and 1116 KiB/s */ @@ -851,49 +874,100 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d printf(_(" %s downloading...\n"), filename); multibar_ui.cursor_lineno++; multibar_ui.active_downloads_num++; + + if(total_enabled) { + /* redraw the total download progress bar */ + draw_pacman_progress_bar(totalbar); + printf("\n"); + multibar_ui.cursor_lineno++; + } } -/* Draws download progress */ -static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) +/* Update progress bar rate/eta stats. + * Returns true if the bar redraw is required, false otherwise + */ +static bool update_bar_stats(struct pacman_progress_bar *bar) { - int index; - struct pacman_progress_bar *bar; - int64_t curr_time = get_time_ms(); - double last_chunk_rate; int64_t timediff; - bool ok; - - if(!dload_progressbar_enabled()) { - return; - } - - ok = find_bar_for_filename(filename, &index, &bar); - assert(ok); + off_t last_chunk_amount; + double last_chunk_rate; + int64_t curr_time = get_time_ms(); /* compute current average values */ timediff = curr_time - bar->sync_time; if(timediff < UPDATE_SPEED_MS) { /* return if the calling interval was too short */ - return; + return false; } + last_chunk_amount = bar->xfered - bar->sync_xfered; + bar->sync_xfered = bar->xfered; bar->sync_time = curr_time; - last_chunk_rate = (double)(data->downloaded - bar->xfered) / (timediff / 1000.0); + last_chunk_rate = (double)last_chunk_amount * 1000 / timediff; /* average rate to reduce jumpiness */ bar->rate = (last_chunk_rate + 2 * bar->rate) / 3; if(bar->rate > 0.0) { - bar->eta = (data->total - data->downloaded) / bar->rate; + bar->eta = (bar->total_size - bar->sync_xfered) / bar->rate; } else { bar->eta = UINT_MAX; } + return true; +} + +static void update_bar_finalstats(struct pacman_progress_bar *bar) +{ + int64_t timediff; + + /* compute final values */ + bar->xfered = bar->total_size; + bar->sync_xfered = bar->total_size; + timediff = get_time_ms() - bar->init_time; + + /* if transfer was too fast, treat it as a 1ms transfer, for the sake + * of the rate calculation */ + if(timediff < 1) + timediff = 1; + + bar->rate = (double)bar->total_size * 1000 / timediff; + /* round elapsed time (in ms) to the nearest second */ + bar->eta = (unsigned int)(timediff + 500) / 1000; +} + +/* Handles download progress event */ +static void dload_progress_event(const char *filename, alpm_download_event_progress_t *data) +{ + int index; + struct pacman_progress_bar *bar; + bool ok; + off_t last_chunk_amount; + + if(!dload_progressbar_enabled()) { + return; + } + + ok = find_bar_for_filename(filename, &index, &bar); + assert(ok); + /* Total size is received after the download starts. */ - bar->total_size = data->total; + last_chunk_amount = data->downloaded - bar->xfered; bar->xfered = data->downloaded; + bar->total_size = data->total; + + if(update_bar_stats(bar)) { + console_cursor_goto_bar(index); + draw_pacman_progress_bar(bar); + } + + if(total_enabled) { + totalbar->xfered += last_chunk_amount; + if(update_bar_stats(totalbar)) { + console_cursor_move_end(); + draw_pacman_progress_bar(totalbar); + } + } - console_cursor_goto_bar(index); - draw_pacman_progress_bar(bar); fflush(stdout); } @@ -902,7 +976,6 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl { int index; struct pacman_progress_bar *bar; - int64_t timediff; bool ok; if(!dload_progressbar_enabled()) { @@ -923,18 +996,7 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl /* The line contains text from previous status. Erase these leftovers. */ console_erase_line(); } else if(data->result == 0) { - /* compute final values */ - bar->xfered = bar->total_size; - timediff = get_time_ms() - bar->init_time; - - /* if transfer was too fast, treat it as a 1ms transfer, for the sake - * of the rate calculation */ - if(timediff < 1) - timediff = 1; - - bar->rate = (double)bar->xfered / (timediff / 1000.0); - /* round elapsed time (in ms) to the nearest second */ - bar->eta = (unsigned int)(timediff + 500) / 1000; + update_bar_finalstats(bar); if(multibar_ui.move_completed_up && index != 0) { /* If this item completed then move it to the top. -- 2.29.2

1 0

[pacman-dev] Remove skipped warning message for already installed packages when --needed is specified?
by Daan De Meyer 07 Dec '20

07 Dec '20

Hi, I recently added --needed to pacman's invocation in mkosi but noticed that even when --needed is specified, pacman still prints warning messages for packages that it's skipping because they are already installed. My intuition was that by enabling --needed, I was explicitly telling pacman that there might be packages that are already installed in the packages that I'm installing and that I want to skip those and not be warned about them. The skipping works fine but I still get warnings. Would it make sense to remove the skipped warning message for packages that are already installed when --needed is specified since the user is explicitly requesting this behavior? Cheers, Daan

2 2

[pacman-dev] [PATCH] Add --confirm
by morganamilo 07 Dec '20

07 Dec '20

this is useful for cancelling the automatically passed --noconfirm by makechrootpkg diff --git a/doc/makepkg.8.asciidoc b/doc/makepkg.8.asciidoc index 3b5e61b3..b3ecbe12 100644 --- a/doc/makepkg.8.asciidoc +++ b/doc/makepkg.8.asciidoc @@ -184,6 +184,9 @@ Options (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. +*\--confirm*:: + Cancels the effects of a previous --noconfirm. + *\--needed*:: (Passed to pacman) Tell pacman not to reinstall a target if it is already up-to-date. (used with '-i' / '\--install'). diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b39433f3..1c8e8a0e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -997,6 +997,7 @@ usage() { printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" printf -- "$(gettext " --needed Do not reinstall the targets that are already up to date")\n" printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" + printf -- "$(gettext " --confirm Cancels the effects of a previous --noconfirm")\n" printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" echo printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" @@ -1036,7 +1037,7 @@ OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options -OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') +OPT_LONG+=('asdeps' 'confirm' 'noconfirm' 'needed' 'noprogressbar') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit $E_INVALID_OPTION @@ -1050,6 +1051,7 @@ while true; do --asdeps) ASDEPS=1;; --needed) NEEDED=1;; --noconfirm) PACMAN_OPTS+=("--noconfirm") ;; + --confirm) PACMAN_OPTS+=("--confirm") ;; --noprogressbar) PACMAN_OPTS+=("--noprogressbar") ;; # Makepkg Options -- 2.29.2

2 1

[pacman-dev] Alternatives system
by Allan McRae 06 Dec '20

06 Dec '20

Hi all, I plan to finish implementing an alternatives system for pacman post 5.2 release: https://wiki.archlinux.org/index.php/User:Allan/Alternatives Any comments or suggestions? Thanks, Allan

6 7

[pacman-dev] [GIT] The official pacman repository tag, last-deltapkgs-commit, created. v5.1.1-144-g377d4714
by Allan McRae 04 Dec '20

04 Dec '20

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 tag, last-deltapkgs-commit has been created at 377d47142f7aaa01ca782e6587f2d4caf663865b (commit) - Log ----------------------------------------------------------------- commit 377d47142f7aaa01ca782e6587f2d4caf663865b Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Thu Feb 21 13:20:19 2019 +0100 doc: add man page for pacman-conf Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

2 2

[pacman-dev] [GIT] The official pacman repository annotated tag, v6.0.0alpha1, created. v6.0.0alpha1
by Allan McRae 04 Dec '20

04 Dec '20

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 annotated tag, v6.0.0alpha1 has been created at 09b67861d9c550b0de411f95f36421d48c524499 (tag) tagging a4240a55e448ffba15a5edbad1a31cb76f821231 (commit) replaces v5.2.1 tagged by Allan McRae on Fri Dec 4 13:36:09 2020 +1000 - Log ----------------------------------------------------------------- Time to road-test the new downloader code -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEZkWwqMcAXnjbHXhk+Z/+D+rpmb0FAl/Jrs8ACgkQ+Z/+D+rp mb3T8gf/e6W1zu0Uhs2HqzqTvZHCIHnROKNSMBH/h3iA1iavwqS6fvnZXqOcsIEC 02Nk8H9Tu4V0EIDWck9wjAGddtQNeR1w3/ljaEZmazILH8mUYbHu4t/VSJH68JgP EBF2BhEL6Ut2g2YuYOZSrIjC6cSdJ7j3uxM7ltuhZibCvux8Q2UxbFdncTvyB6ql 2L2cKWl9RURXu72+JGdGY5xyAv5KG5mwKyEPieWBV5+Mhb5iCDFfH9ILVO/XCwK8 Gv+bb4UT+IZ+UO9zj/rVl07lqqiGf8Ynj2DsdK6t7Vx1QIV+ms6ru27EqcKVkumr P2LRogLuerYf5CrO/I5saaf+B/LZtg== =4C8n -----END PGP SIGNATURE----- Allan McRae (31): Move update-copyright into build-aux Remove "Generated from ...; do not edit by hand" from scripts libalpm/sync.c: Do not download missing keys multiple times pactest: set package tar format to GNU_FORMAT Handle .part files that are the size of the correct package Add Eli to current maintainers Fix leak in _alpm_db_search on error condition Improved documentation for alpm_db_search() parameters Fix documentation of alpm_mtree_next and remove libarchive exposure tests: Fix typo in test description Increase meson test timeout Remove unneeded ltmain patch Increase maximum database size Fix "pacman -U <url>" operations Note that checksums from "makepkg -g" are not ideal makepkg: add CRC checksums and set these to be the default Add pacman-hooks.5 man page symlink build-aux/update-copyright 2019 2020 Remove unneeded goto cleanup Add file and line number to RET_ERR{,_VOID} Use STRDUP for error checking in more places Use GOTO_ERR throughout pacman.8: Fix typo Add Gitlab Runner configuration Convert gitlab valgrind runner to meson Remove autotools support libalpm/signing.c: Fix calculation of packet size in parse_subpacket Revert "makepkg: drop duplicate reporting of missing dependencies" pacman-key: change signing key to RSA4096 makepkg.conf: Reword "Defaults" Modify "pacman -h" output for files operations Anatol Pomozov (33): Eliminate extra loop over dbs_sync Simplify construction of payloads in download_files Do not download files if find_dl_candidates() fails Move flushing 'output' list into separate function Add GOTO_ERR() macro to set error and then goto a label Hide cursor while pacman is running Add config option to specify amount of parallel download streams Introduce alpm_dbs_update() function for parallel db updates Add multi_curl handle to ALPM global context Inline dload_payload->curlerr field into a local variable Implement _alpm_multi_download Implement multiplexed download using mCURL Introduce event types for start/end database list download Extend download callback interface with start/complete events Implement multibar UI Convert download packages logic to multiplexed API Convert downloading databases to the new multiplexed API Swap alpm_db_update() implementation to multiplexed version Convert '-U pkg1 pkg2' codepath to parallel download Cleanup the old sequential download code Move signature payload creation to download engine Do not use counter for error tracking Add a utility function to check whether a file exists in the cache FS#33992: force download *.sig file if it does not exist in the cache Fallback to detached signatures during keyring check Build signature remote name based on the main payload name Do not free payload fields in the middle of this structure use Check that destfile_name exists before using it Fix error during keyring checking Enable sha256/md5 hash verification if detached signatures are used FS#66472: Remove *.sig file if package corrupted Go to the end of screen if 'printonly' mode enabled Move cursor to the end of the screen at the SIGINT Carson Black (1): Dull version colour numbers in summary Chih-Hsuan Yen (1): util.c: table_print_line: properly align texts involving CJK Colin Woodbury (1): Restore usage line for -Fh Daniel T. Borelli (1): Dereference double pointer before assigning NULL Dave Reisner (5): Ensure regex object is always initialized Use c99 struct initialization to avoid memset calls makepkg: drop duplicate reporting of missing dependencies meson: handle XFAIL tests outside of TAP Avoid depending on side effects in assert(...) expressions Denton Liu (1): srcinfo.sh: remove trailing newline Earnestly (1): Use noextract with pacman-conf NoExtract Eli Schwartz (30): scripts/library: remove human_to_size build: remove use of handcrafted m4 in configuring scripts makepkg: fix regression that broke extraction of file:// sources meson: make non-symlink scripts install for real, and use a better wrapper pactest: add environment option to run tests with valgrind makepkg: add the $startdir to package .BUILDINFO autotools: emit error message when autoconf-archive is missing doc: clarify the format of a PKGBUILD source fragment doc: reformat intro to VCS sources to distinguish the grammar makepkg: make per-package files containing '$pkgname' consistently work meson: use better check for debug builds editorconfig: set meson indentation style doc: remove vim modelines from BUILDINFO(5) pacman-conf: add support for new ParallelDownloads config option pacman-conf: fix incomplete support for ILoveCandy Log invalid conf settings as an error libmakepkg/strip: don't re-add the same debug source multiple times build: add libintl dependency to meson and the .pc file makepkg: guard against undefined git pinned sources makepkg: correctly handle missing download clients libmakepkg: fix regression in sending plain() output to stderr makepkg/repo-add: handle GPGKEY with spaces makepkg/repo-add: do not accept public-only keys for signing doc/pacman.8: fix typo libmakepkg: extend compress.sh to also permit checking validity repo-add: use more libmakepkg to handle common compression routines remove more autotools files makepkg: libprovides: don't provide both versioned and unversioned sonames makepkg: fix signing of source packages makepkg: properly localize some internal function variables Ethan Sommer (5): libmakepkg: add optional argument support to parseopts libmakepkg: fix empty arguments in parseopts makepkg: replaces sed in-place with built in substitution repo-add: use wc -c on stdin instead of file to avoid use of cut libmakepkg: use readelf instead of file for finding ELF file types Filipe Laíns (1): ci: cache packages Ivy Foster (2): Add NoProgressbar to pacman.conf options Add fossil scm support to makepkg Levente Polyak (1): makepkg: deterministic PKGINFO libprovides for multiple library versions Matthew Sexton (2): pacman-key: hide lsign and revoke output behind --verbose pacman-key: ignore already lsigned/deleted keys Michael Straube (2): makepkg: emptydirs: fix typo libmakepkg: compress: fix tar extension Morten Linderud (1): doc/makepkg.8: Added punctuations. Rikard Falkeborn (2): Add REALLOC macro to simplify realloc error handling Constify some input pointers Ronan Pigott (1): Add pacman-conf zsh completions morganamilo (12): pacman: clarify error when alpm fails to init pacman: make exact_file an int pacman+libalpm: handle search errors pacman: print error when -Fx is given invalid regex libalpm: fix alpm_option_set_assumeinstalled Docs docs docs libalpm: set parallel_downloads to 1 when creating the handle libalpm: don't call dlcb when not set libalpm: clarify alpm_download_event_completed_t status libalpm: set errno when setting parallel downloads with an invalid number libalpm: add alpm_option_get_parallel_downloads libalpm: set ret in download files ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-134-ga4240a55
by Allan McRae 03 Dec '20

03 Dec '20

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 a4240a55e448ffba15a5edbad1a31cb76f821231 (commit) via 20f2ae56eb4ae1affd274185c173524f5b4fb2f1 (commit) via 5c24f7dd11a241f6414e3ee6f95f224382ec27ce (commit) from 08f4ae709ca00ec9b4c56d92d3cdd7de4e6effc2 (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 a4240a55e448ffba15a5edbad1a31cb76f821231 Author: Colin Woodbury <colin(a)fosskers.ca> Date: Wed Nov 25 12:53:11 2020 -0800 Restore usage line for -Fh Unlike the other main commands, -F was missing its top-level usage line in its help output. Signed-off-by: Colin Woodbury <colin(a)fosskers.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 20f2ae56eb4ae1affd274185c173524f5b4fb2f1 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 3 21:34:01 2020 +1000 Modify "pacman -h" output for files operations pacman -F can take both a file(s) or a package(s) as arguments. Passing a file is more common, so adjust to show that in the help. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5c24f7dd11a241f6414e3ee6f95f224382ec27ce Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Nov 30 18:21:26 2020 +0000 libalpm: set ret in download files download_files never set ret on failiure, so even when downloading fails, the transaction goes on to commit and error out. :: Retrieving packages... python-packaging-20.4-4-any.pkg.tar.zst failed to download error: failed retrieving file 'python-packaging-20.4-4-any.pkg.tar.zst' from mirror.oldsql.cc : The requested URL returned error: 404 warning: failed to retrieve some files (1/1) checking keys in keyring (1/1) checking package integrity error: failed to commit transaction (wrong or NULL argument passed) Errors occurred, no packages were upgraded. Also make the ret checking more consistent. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 6 ++++-- src/pacman/pacman.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Restore usage line for -Fh
by Colin Woodbury 03 Dec '20

03 Dec '20

Unlike the other main commands, -F was missing its top-level usage line in its help output. Signed-off-by: Colin Woodbury <colin(a)fosskers.ca> --- src/pacman/pacman.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fefd3fa4..69e2e42a 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -176,6 +176,8 @@ static void usage(int op, const char * const myname) printf("%s: %s {-T --deptest} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); } else if(op == PM_OP_FILES) { + printf("%s: %s {-F --files} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); + printf("%s:\n", str_opt); addlist(_(" -l, --list list the files owned by the queried package\n")); addlist(_(" -q, --quiet show less information for query and search\n")); addlist(_(" -x, --regex enable searching using regular expressions\n")); -- 2.29.2

2 3

[pacman-dev] [PATCH] Modify "pacman -h" output for files operations
by Allan McRae 03 Dec '20

03 Dec '20

pacman -F can take both a file(s) or a package(s) as arguments. Passing a file is more common, so adjust to show that in the help. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fefd3fa4..f98c9a4a 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -110,7 +110,7 @@ static void usage(int op, const char * const myname) printf(" %s {-h --help}\n", myname); printf(" %s {-V --version}\n", myname); printf(" %s {-D --database} <%s> <%s>\n", myname, str_opt, str_pkg); - printf(" %s {-F --files} [%s] [%s]\n", myname, str_opt, str_pkg); + printf(" %s {-F --files} [%s] [%s]\n", myname, str_opt, str_file); printf(" %s {-Q --query} [%s] [%s]\n", myname, str_opt, str_pkg); printf(" %s {-R --remove} [%s] <%s>\n", myname, str_opt, str_pkg); printf(" %s {-S --sync} [%s] [%s]\n", myname, str_opt, str_pkg); -- 2.29.2

1 0

[pacman-dev] [PATCH] lock file may be left behind when a signal arrives while in cleanup
by lilydjwg 03 Dec '20

03 Dec '20

When a SIGINT or SIGHUP arrives before alpm_unlock (in alpm_release) but after remove_soft_interrupt_handler, the lock file will be left behind. Signed-off-by: lilydjwg <lilydjwg(a)gmail.com> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fefd3fa4..2d2e41d2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -287,7 +287,6 @@ static void setuseragent(void) */ static void cleanup(int ret) { - remove_soft_interrupt_handler(); if(config) { /* free alpm library resources */ if(config->handle && alpm_release(config->handle) == -1) { @@ -297,6 +296,7 @@ static void cleanup(int ret) config_free(config); config = NULL; } + remove_soft_interrupt_handler(); /* free memory */ FREELIST(pm_targets); -- 2.28.0

2 4

[pacman-dev] [PATCH] libalpm: set ret in download files
by morganamilo 30 Nov '20

30 Nov '20

download_files never set ret on failiure, so even when downloading fails, the transaction goes on to commit and error out. :: Retrieving packages... python-packaging-20.4-4-any.pkg.tar.zst failed to download error: failed retrieving file 'python-packaging-20.4-4-any.pkg.tar.zst' from mirror.oldsql.cc : The requested URL returned error: 404 warning: failed to retrieve some files (1/1) checking keys in keyring (1/1) checking package integrity error: failed to commit transaction (wrong or NULL argument passed) Errors occurred, no packages were upgraded. Also make the ret checking more consistent. diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 601f1d69..5d8652a5 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -769,7 +769,7 @@ static int download_files(alpm_handle_t *handle) } ret = find_dl_candidates(handle, &files); - if(ret) { + if(ret != 0) { goto finish; } @@ -818,7 +818,9 @@ static int download_files(alpm_handle_t *handle) payloads = alpm_list_add(payloads, payload); } - if(_alpm_download(handle, payloads, cachedir) == -1) { + + ret = _alpm_download(handle, payloads, cachedir); + if(ret != 0) { event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED; EVENT(handle, &event); _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); -- 2.29.2

3 2

[pacman-dev] [PATCH 1/5] libalpm: set parallel_downloads to 1 when creating the handle
by morganamilo 28 Nov '20

28 Nov '20

Fixes FS#68729 diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 34c5b4b2..5d36136d 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -61,6 +61,8 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, /* set default database extension */ STRDUP(myhandle->dbext, ".db", goto nomem); + myhandle->parallel_downloads = 1; + lockfilelen = strlen(myhandle->dbpath) + strlen(lf) + 1; MALLOC(myhandle->lockfile, lockfilelen, goto nomem); snprintf(myhandle->lockfile, lockfilelen, "%s%s", myhandle->dbpath, lf); -- 2.29.2

3 9

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-131-g08f4ae70
by Allan McRae 26 Nov '20

26 Nov '20

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 08f4ae709ca00ec9b4c56d92d3cdd7de4e6effc2 (commit) via 73e0d7dedc197f71c4fd6b7c18d2b2f2d63bf013 (commit) via 66f9f315cf36a5b73c18c627f7cee060a1360abd (commit) via 75cfce94682fcd0e9bbeed5db1f97dbb5b1be9e7 (commit) via 4b8c274f7fc1ecd8cee9176471f081da3323b258 (commit) via 9dc29ebf5f3c6fe34b5a1b60f6f57f88668d9d20 (commit) via db4092e33dacc6a0bb8afd283a82e6f4327cb865 (commit) via 2859a6eefcb465a382267c6e5981192c6a54f5bb (commit) via 94ac3330dd3a42958ad5d9606ec254bc112936bf (commit) from 4d8f58d3b940f778b27c59e53ea9f3fab20a07ba (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 08f4ae709ca00ec9b4c56d92d3cdd7de4e6effc2 Author: Ivy Foster <escondida(a)iff.ink> Date: Wed Nov 25 22:38:24 2020 -0600 Add fossil scm support to makepkg Signed-off-by: Ivy Foster <escondida(a)iff.ink> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 73e0d7dedc197f71c4fd6b7c18d2b2f2d63bf013 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:08 2020 +0000 libalpm: add alpm_option_get_parallel_downloads Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 66f9f315cf36a5b73c18c627f7cee060a1360abd Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:07 2020 +0000 libalpm: set errno when setting parallel downloads with an invalid number Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 75cfce94682fcd0e9bbeed5db1f97dbb5b1be9e7 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:06 2020 +0000 libalpm: clarify alpm_download_event_completed_t status The comment makes it seem that the result itself is an error code. But all it does is simply return -1 to indicate an error occured; Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4b8c274f7fc1ecd8cee9176471f081da3323b258 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:05 2020 +0000 libalpm: don't call dlcb when not set Fixes FS#68728: Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9dc29ebf5f3c6fe34b5a1b60f6f57f88668d9d20 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Nov 24 12:39:04 2020 +0000 libalpm: set parallel_downloads to 1 when creating the handle Fixes FS#68729 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit db4092e33dacc6a0bb8afd283a82e6f4327cb865 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Tue Nov 3 17:04:38 2020 -0800 Move cursor to the end of the screen at the SIGINT It requires exposing 'move cursor to the end' function in a pacman header file. We use it as a chance to make naming of the cursor management functions more consistent. Note that there is still possibility of a race condition in the cursor update logic. 'update cursor index variable' and 'send ASCII control symbols to console' is not an atomic operation. So if an SIGINT is received between these two action then cursor position is going to be screwed. Fixes FS#67973 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2859a6eefcb465a382267c6e5981192c6a54f5bb Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Thu Oct 22 09:31:14 2020 -0700 Go to the end of screen if 'printonly' mode enabled At the end of download operation our code makes sure the cursor is moved to the end of the drawing area. But 'printonly' mode has its own if() branch that skips this cursor alignment. Add cursor_goto_end() to the 'printonly' codepath to make sure it does not clobber previous output. Fixes FS#68355 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 94ac3330dd3a42958ad5d9606ec254bc112936bf Author: Michael Straube <michael.straubej(a)gmail.com> Date: Wed Oct 21 10:05:43 2020 +0200 libmakepkg: compress: fix tar extension With commit 74aacf44958e1343b910b3fbdcf753393857f070 creating uncompressed .tar packages fails. -> Compressing package... /usr/share/makepkg/util/compress.sh: line 70: COMPRESS.TAR[@]: invalid variable name bsdtar: Write error Empty the '$ext' variable for the '.tar' extension in get_compress_command() to fix this. We would fallback to cat for 'tar' anyways. Signed-off-by: Michael Straube <michael.straubej(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.asciidoc | 3 + etc/makepkg.conf.in | 1 + lib/libalpm/alpm.c | 2 + lib/libalpm/alpm.h | 8 +- lib/libalpm/dload.c | 4 +- lib/libalpm/handle.c | 14 +++- scripts/libmakepkg/executable/vcs.sh.in | 2 +- .../libmakepkg/source/{git.sh.in => fossil.sh.in} | 96 ++++++++++------------ scripts/libmakepkg/source/meson.build | 1 + scripts/libmakepkg/util/compress.sh.in | 3 + scripts/libmakepkg/util/source.sh.in | 5 +- src/pacman/callback.c | 23 +++--- src/pacman/sighandler.c | 3 + src/pacman/util.h | 1 + 14 files changed, 91 insertions(+), 75 deletions(-) copy scripts/libmakepkg/source/{git.sh.in => fossil.sh.in} (51%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Move cursor to the end of the screen at the SIGINT
by Anatol Pomozov 26 Nov '20

26 Nov '20

It requires exposing 'move cursor to the end' function in a pacman header file. We use it as a chance to make naming of the cursor management functions more consistent. Note that there is still possibility of a race condition in the cursor update logic. 'update cursor index variable' and 'send ASCII control symbols to console' is not an atomic operation. So if an SIGINT is received between these two action then cursor position is going to be screwed. Fixes FS#67973 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/pacman/callback.c | 24 +++++++++++------------- src/pacman/sighandler.c | 3 +++ src/pacman/util.h | 1 + 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 53518101..12ab952f 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -92,8 +92,6 @@ struct pacman_multibar_ui { struct pacman_multibar_ui multibar_ui = {0}; -static void cursor_goto_end(void); - void multibar_move_completed_up(bool value) { multibar_ui.move_completed_up = value; } @@ -226,7 +224,7 @@ static int number_length(size_t n) void cb_event(alpm_event_t *event) { if(config->print) { - cursor_goto_end(); + console_cursor_move_end(); return; } switch(event->type) { @@ -389,7 +387,7 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_DB_RETRIEVE_FAILED: case ALPM_EVENT_PKG_RETRIEVE_DONE: case ALPM_EVENT_PKG_RETRIEVE_FAILED: - cursor_goto_end(); + console_cursor_move_end(); flush_output_list(); on_progress = 0; break; @@ -694,7 +692,7 @@ static int dload_progressbar_enabled(void) } /* Goto the line that corresponds to num-th active download */ -static void cursor_goto_bar(int num) +static void console_cursor_goto_bar(int num) { if(num > multibar_ui.cursor_lineno) { console_cursor_move_down(num - multibar_ui.cursor_lineno); @@ -705,9 +703,9 @@ static void cursor_goto_bar(int num) } /* Goto the line *after* the last active progress bar */ -static void cursor_goto_end(void) +void console_cursor_move_end(void) { - cursor_goto_bar(multibar_ui.active_downloads_num); + console_cursor_goto_bar(multibar_ui.active_downloads_num); } /* Returns true if element with the specified name is found, false otherwise */ @@ -849,7 +847,7 @@ static void dload_init_event(const char *filename, alpm_download_event_init_t *d bar->rate = 0.0; multibar_ui.active_downloads = alpm_list_add(multibar_ui.active_downloads, bar); - cursor_goto_end(); + console_cursor_move_end(); printf(_(" %s downloading...\n"), filename); multibar_ui.cursor_lineno++; multibar_ui.active_downloads_num++; @@ -894,7 +892,7 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr bar->total_size = data->total; bar->xfered = data->downloaded; - cursor_goto_bar(index); + console_cursor_goto_bar(index); draw_pacman_progress_bar(bar); fflush(stdout); } @@ -920,7 +918,7 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl bar->total_size = data->total; if(data->result == 1) { - cursor_goto_bar(index); + console_cursor_goto_bar(index); printf(_(" %s is up to date"), bar->filename); /* The line contains text from previous status. Erase these leftovers. */ console_erase_line(); @@ -947,16 +945,16 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl multibar_ui.active_downloads->data = bar; baritem->data = former_topbar; - cursor_goto_bar(index); + console_cursor_goto_bar(index); draw_pacman_progress_bar(former_topbar); index = 0; } - cursor_goto_bar(index); + console_cursor_goto_bar(index); draw_pacman_progress_bar(bar); } else { - cursor_goto_bar(index); + console_cursor_goto_bar(index); printf(_(" %s failed to download"), bar->filename); console_erase_line(); } diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index fc4ea766..ff9c6ac4 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -53,6 +53,8 @@ static void _reset_handler(int signum) */ static void soft_interrupt_handler(int signum) { + console_cursor_move_end(); + if(signum == SIGINT) { const char msg[] = "\nInterrupt signal received\n"; xwrite(STDERR_FILENO, msg, ARRAYSIZE(msg) - 1); @@ -96,6 +98,7 @@ static void segv_handler(int signum) sigset_t segvset; const char msg[] = "\nerror: segmentation fault\n" "Please submit a full bug report with --debug if appropriate.\n"; + console_cursor_move_end(); xwrite(STDERR_FILENO, msg, sizeof(msg) - 1); xwrite(STDOUT_FILENO, CURSOR_SHOW_ANSICODE, sizeof(CURSOR_SHOW_ANSICODE) - 1); diff --git a/src/pacman/util.h b/src/pacman/util.h index c97048fb..ceaec6bd 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -85,6 +85,7 @@ void console_cursor_hide(void); void console_cursor_show(void); void console_cursor_move_up(unsigned int lines); void console_cursor_move_down(unsigned int lines); +void console_cursor_move_end(void); /* Erases line from the current cursor position till the end of the line */ void console_erase_line(void); -- 2.29.2

2 1

[pacman-dev] [PATCH v2] libmakepkg: lint all arrays for empty values
by morganamilo 26 Nov '20

26 Nov '20

Empty values break pacman's db format, as an empty line indicates an end of section. --- I've seen this out in the wild: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vim-coc-highlight-gi… diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 1bc49722..22f5fbbb 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -31,7 +31,7 @@ lint_pkgbuild_functions+=('lint_variable') lint_variable() { - local i a pkg out bad ret=0 + local i a pkg out bad array var ret=0 # global variables for i in ${pkgbuild_schema_arrays[@]}; do @@ -93,5 +93,62 @@ lint_variable() { done done + # ensure lists don't contain empty values + for i in ${pkgbuild_schema_arrays[@]}; do + if declare -p $i > /dev/null 2>&1; then + array_build "array" "$i" + for var in "${array[@]}"; do + if [[ -z "$var" ]]; then + error "$(gettext "%s is not allowed to be empty")" "$i" + ret=1 + fi + done + fi + done + + for a in ${arch[@]}; do + [[ $a == "any" ]] && continue + + for i in ${pkgbuild_schema_arch_arrays[@]}; do + if declare -p "${i}_${a}" > /dev/null 2>&1; then + array_build "array" "${i}_${a}" + for var in "${array[@]}"; do + if [[ -z "$var" ]]; then + error "$(gettext "%s is not allowed to be empty")" "${i}_${a}" + ret=1 + fi + done + fi + done + done + + for pkg in ${pkgname[@]}; do + for i in ${pkgbuild_schema_arrays[@]}; do + if extract_function_variable "package_$pkg" $i 1 out; then + for val in "${out[@]}" ;do + if [[ -z "$val" ]]; then + error "$(gettext "%s is not allowed to be empty")" "$i" + ret=1 + fi + done + fi + done + + for a in ${arch[@]}; do + [[ $a == "any" ]] && continue + + for i in ${pkgbuild_schema_arch_arrays[@]}; do + if extract_function_variable "package_$pkg" "${i}_${a}" 1 out; then + for val in "${out[@]}" ;do + if [[ -z "$val" ]]; then + error "$(gettext "%s is not allowed to be empty")" "${i}_${a}" + ret=1 + fi + done + fi + done + done + done + return $ret } -- 2.29.1

2 1

[pacman-dev] [PATCH v2] Go to the end of screen if 'printonly' mode enabled
by Anatol Pomozov 26 Nov '20

26 Nov '20

At the end of download operation our code makes sure the cursor is moved to the end of the drawing area. But 'printonly' mode has its own if() branch that skips this cursor alignment. Add cursor_goto_end() to the 'printonly' codepath to make sure it does not clobber previous output. Fixes FS#68355 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/pacman/callback.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 4240a779..53518101 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -226,6 +226,7 @@ static int number_length(size_t n) void cb_event(alpm_event_t *event) { if(config->print) { + cursor_goto_end(); return; } switch(event->type) { -- 2.29.0

2 1